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

util:properties supports multiple resource locations and ignore-resource-not-found

Browse Source 
Issue: SPR-10614
This commit is contained in:
Juergen Hoeller
2014-08-20 16:31:54 +02:00
parent e48c315ad1
commit 662d8aa9f1
4 changed files with 106 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
View File

@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd">
<util:constant id="min" static-field="
java.lang.Integer.
@@ -157,7 +157,8 @@
location="classpath:/org/springframework/beans/factory/xml/util.properties"/>
<util:properties id="myScopedProperties"
location="classpath:/org/springframework/beans/factory/xml/util.properties" scope="prototype"/>
location="classpath:/org/springframework/beans/factory/xml/util.properties,classpath:override.properties"
ignore-resource-not-found="true" scope="prototype"/>
<util:properties id="myLocalProperties">
<prop key="foo2">bar2</prop>