admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revised ResourcePropertySource in order to avoid ConfigurationClassProcessor's AnnotationPropertySource subclass

Browse Source 
Issue: SPR-12115
This commit is contained in:
Juergen Hoeller
2014-08-22 13:54:39 +02:00
parent dbe337f932
commit 9dfbc5326b
5 changed files with 73 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
+2
View File
@@ -362,6 +362,7 @@ public class PropertySourceAnnotationTests {
static class ConfigWithEmptyResourceLocations {
}
@Import({ ConfigImportedWithSameSourceImportedInDifferentOrder.class })
@PropertySources({
@PropertySource("classpath:org/springframework/context/annotation/p1.properties"),
@@ -372,6 +373,7 @@ public class PropertySourceAnnotationTests {
}
@Configuration
@PropertySources({
@PropertySource("classpath:org/springframework/context/annotation/p2.properties"),