spring-framework

Spring Framework

Chris Beams 41ade68b50 Fix @PropertySource bug with multiple values Prior to this commit, specifying a named @PropertySource with multiple values would not work as expected. e.g.: @PropertySource( name = "ps", value = { "classpath:a.properties", "classpath:b.properties" }) In this scenario, the implementation would register a.properties with the name "ps", and subsequently register b.properties with the name "ps", overwriting the entry for a.properties. To fix this behavior, a CompositePropertySource type has been introduced which accepts a single name and a set of PropertySource objects to iterate over. ConfigurationClassParser's @PropertySource parsing routine has been updated to use this composite approach when necessary, i.e. when both an explicit name and more than one location have been specified. Note that if no explicit name is specified, the generated property source names are enough to distinguish the instances and avoid overwriting each other; this is why the composite wrapper is not used in these cases. Issue: SPR-9127		14 years ago
..
.settings	…
src	Fix @PropertySource bug with multiple values	14 years ago
.classpath	Upgrade to Hibernate Validator 4.2.0.Final	14 years ago
.project	Convert CRLF=>LF on files missed earlier	14 years ago
.springBeans	Remove "Feature" support introduced in 3.1 M1	15 years ago
build.xml	…
context.iml	Convert CRLF=>LF on files missed earlier	14 years ago
ivy.xml	used specific SLF4J versions for running the test suites of individual modules (fixing the Hibernate Validator 4.2 upgrade)	14 years ago
pom.xml	Add <license> section to 3.1.x Maven poms	14 years ago
template.mf	cleanup of conversation dependencies	14 years ago