Default spring.config.location to file: if no prefix supplied

Fixes spring-projectsgh-198

Author: Dave Syer

spring-boot/src/main/java/org/springframework/boot/context/listener/ConfigFileApplicationListener.java

@@ -263,7 +263,16 @@ private List<String> getCandidateLocations(ResourceLoader resourceLoader) {
 
 	private PropertySource<?> load(ConfigurableEnvironment environment,
 			ResourceLoader resourceLoader, String location, String profile) {
-		location = environment.resolvePlaceholders(location);
+
+		String path = environment.resolvePlaceholders(location);
+		if (LOCATION_VARIABLE.equals(location) && !path.contains("$")) {
+			if (!path.contains(":")) {
+				path = "file:" + path;
+			}
+			path = StringUtils.cleanPath(path);
+		}
+		location = path;
+
 		String suffix = "." + StringUtils.getFilenameExtension(location);
 		Class<?> type = this.propertySourceAnnotations.configuration(location);
 

spring-boot/src/test/java/org/springframework/boot/context/listener/ConfigFileApplicationListenerTests.java

@@ -153,8 +153,8 @@ public void yamlSetsProfiles() throws Exception {
 
 	@Test
 	public void yamlProfileCanBeChanged() throws Exception {
-		EnvironmentTestUtils
-				.addEnviroment(this.environment, "spring.profiles.active:prod");
+		EnvironmentTestUtils.addEnviroment(this.environment,
+				"spring.profiles.active:prod");
 		this.initializer.setNames("testsetprofiles");
 		this.initializer.onApplicationEvent(this.event);
 		assertThat(Arrays.asList(this.environment.getActiveProfiles()).toString(),
@@ -189,6 +189,25 @@ public void specificResource() throws Exception {
 		assertThat(this.environment.getProperty("foo"), equalTo("bucket"));
 	}
 
+	@Test
+	public void specificResourceAsFile() throws Exception {
+		String location = "file:src/test/resources/specificlocation.properties";
+		EnvironmentTestUtils.addEnviroment(this.environment, "spring.config.location:"
+				+ location);
+		this.initializer.onApplicationEvent(this.event);
+		assertThat(this.environment.getPropertySources().contains(location), is(true));
+	}
+
+	@Test
+	public void specificResourceDefaultsToFile() throws Exception {
+		String location = "src/test/resources/specificlocation.properties";
+		EnvironmentTestUtils.addEnviroment(this.environment, "spring.config.location:"
+				+ location);
+		this.initializer.onApplicationEvent(this.event);
+		assertThat(this.environment.getPropertySources().contains("file:" + location),
+				is(true));
+	}
+
 	@Test
 	public void propertySourceAnnotation() throws Exception {
 		SpringApplication application = new SpringApplication(WithPropertySource.class);