Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
This commit is contained in:
Phillip Webb
2015-02-01 20:28:11 -08:00
parent 763a735bd5 555827cad7
commit 3328c1369f
14 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/EmbeddedJarStarter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
/**
* Main class to start the embedded server.
*
* @author Phillip Webb
* @author Dave Syer
*/
public final class EmbeddedJarStarter {
@@ -30,4 +30,5 @@ public final class EmbeddedJarStarter {
context.getBean(SpringConfiguration.class).run(args);
context.close();
}
}

12
spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/SpringConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,19 +27,19 @@ import org.springframework.core.io.support.PropertiesLoaderUtils;
/**
* Spring configuration.
*
* @author Phillip Webb
* @author Dave Syer
*/
@Configuration
@ComponentScan
public class SpringConfiguration {
private String message = "Jar";
@PostConstruct
public void init() throws IOException {
String value = PropertiesLoaderUtils.loadAllProperties("application.properties").getProperty("message");
if (value!=null) {
this.message = value;
this.message = value;
}
}
@@ -48,6 +48,4 @@ public class SpringConfiguration {
System.err.println("Hello Embedded " + this.message + "!");
}
}

4
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -553,7 +553,7 @@ public class PropertiesLauncher extends Launcher {
urls.addAll(index + 1, extra);
}
}
catch (Exception e) {
catch (Exception ex) {
// ignore
}
}