spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-20 20:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Allow multiple locations via @PropertySource#value

Browse Source 
Issue: SPR-8314

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4364 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams
2011-05-25 10:52:25 +00:00
parent 2a896753d4
commit 5049cd0db3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
+7 -5
View File
@@ -174,12 +174,14 @@ class ConfigurationClassParser {
metadata.getAnnotationAttributes(org.springframework.context.annotation.PropertySource.class.getName());
if (propertySourceAttributes != null) {
String name = (String) propertySourceAttributes.get("name");
String location = (String) propertySourceAttributes.get("value");
String[] locations = (String[]) propertySourceAttributes.get("value");
ClassLoader classLoader = this.resourceLoader.getClassLoader();
ResourcePropertySource ps = StringUtils.hasText(name) ?
new ResourcePropertySource(name, location, classLoader) :
new ResourcePropertySource(location, classLoader);
this.propertySources.push(ps);
for (String location : locations) {
ResourcePropertySource ps = StringUtils.hasText(name) ?
new ResourcePropertySource(name, location, classLoader) :
new ResourcePropertySource(location, classLoader);
this.propertySources.push(ps);
}
}
// process any @ComponentScan annotions
org.springframework.context/src/main/java/org/springframework/context/annotation/PropertySource.java
+6 -4
View File
@@ -117,12 +117,14 @@ public @interface PropertySource {
String name() default "";
/**
* Indicate the resource location of the properties file to be loaded.
* Indicate the resource location(s) of the properties file to be loaded.
* For example, {@code "classpath:/com/myco/app.properties"} or
* {@code "file:/path/to/file"}. Note that resource location wildcards
* are not permitted, and that a location must evaluate to exactly one
* {@code .properties} resource.
* are not permitted, and that each location must evaluate to exactly one
* {@code .properties} resource. Each location will be added to the
* enclosing {@code Environment} as its own property source, and in the order
* declared.
*/
String value();
String[] value();
}