Do not use property placeholder in config names

Update ConfigFileApplicationContextInitializer so that the names
property defaults to `${spring.config.name},application`. This allows
application.properties files to be loaded even when property placeholder
expansion is not enabled.

Issue: #54462910
This commit is contained in:
Phillip Webb
2013-08-01 23:33:18 -07:00
parent 448e3283bc
commit 5a7236625b

View File

@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements
private String[] searchLocations = new String[] { "classpath:", "file:./",
"classpath:config/", "file:./config/" };
private String names = "${spring.config.name:application}";
private String names = "${spring.config.name},application";
private int order = Integer.MIN_VALUE + 10;