root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2016-01-19 09:35:10 +01:00
parent 112b707b67 2ceadd705b
commit c57588ac09
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,14 +36,14 @@ import org.springframework.util.StringUtils;
public class LogFile { public class LogFile {
/** /**
* The name of the Spring property that contains the name of the logging configuration * The name of the Spring property that contains the name of the log file. Names can
* file. * be an exact location or relative to the current directory.
*/ */
public static final String FILE_PROPERTY = "logging.file"; public static final String FILE_PROPERTY = "logging.file";
/** /**
* The name of the Spring property that contains the path where the logging * The name of the Spring property that contains the directory where log files are
* configuration can be found. * written.
*/ */
public static final String PATH_PROPERTY = "logging.path"; public static final String PATH_PROPERTY = "logging.path";

10
spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -88,14 +88,14 @@ public class LoggingApplicationListener implements GenericApplicationListener {
public static final String REGISTER_SHUTDOWN_HOOK_PROPERTY = "logging.register-shutdown-hook"; public static final String REGISTER_SHUTDOWN_HOOK_PROPERTY = "logging.register-shutdown-hook";
/** /**
* The name of the Spring property that contains the path where the logging * The name of the Spring property that contains the directory where log files are
* configuration can be found. * written.
*/ */
public static final String PATH_PROPERTY = LogFile.PATH_PROPERTY; public static final String PATH_PROPERTY = LogFile.PATH_PROPERTY;
/** /**
* The name of the Spring property that contains the name of the logging configuration * The name of the Spring property that contains the name of the log file. Names can
* file. * be an exact location or relative to the current directory.
*/ */
public static final String FILE_PROPERTY = LogFile.FILE_PROPERTY; public static final String FILE_PROPERTY = LogFile.FILE_PROPERTY;

4
spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -39,7 +39,7 @@
{ {
"name": "logging.file", "name": "logging.file",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Log file name.", "description": "Name of the log file. Names can be an exact location or relative to the current directory.",
"sourceType": "org.springframework.boot.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.logging.LoggingApplicationListener"
}, },
{ {
@ -69,7 +69,7 @@
{ {
"name": "logging.path", "name": "logging.path",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Location of the log file.", "description": "Directory where log files are written.",
"sourceType": "org.springframework.boot.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.logging.LoggingApplicationListener"
}, },
{ {