From 22ba7b93b21775e8a7d52041ecbb4fa1cf3c088d Mon Sep 17 00:00:00 2001 From: zhanhb Date: Sun, 5 Feb 2017 15:32:15 +0800 Subject: [PATCH 1/2] Fix pid properties link in documentation See gh-8196 --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index bb5ac34a452..f48deb4d737 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -123,7 +123,7 @@ content into your application; rather pick only the properties that you need. # OUTPUT spring.output.ansi.enabled=detect # Configure the ANSI output. - # PID FILE ({sc-spring-boot-actuator}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter]) + # PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter]) spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file. spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used). From a30461c5c7da074a82f13d6d20bebb7b46ac4a99 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 5 Feb 2017 09:23:56 +0100 Subject: [PATCH 2/2] Polish pid metadata This commit moves the `spring.pid.*` metadata to the relevant project. It also updates the doc to refer to the new `ApplicationPidFileWriter` rather than the one in its deprecatred form. Closes gh-8196 --- .../additional-spring-configuration-metadata.json | 12 ------------ .../src/main/asciidoc/production-ready-features.adoc | 2 +- .../additional-spring-configuration-metadata.json | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 11b53d42edc..cdb5479fc0f 100644 --- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -186,18 +186,6 @@ "replacement": "spring.info.git.location" } }, - { - "name": "spring.pid.file", - "type": "java.lang.String", - "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).", - "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter" - }, - { - "name": "spring.pid.fail-on-write-error", - "type": "java.lang.Boolean", - "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.", - "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter" - }, { "name": "spring.pidfile", "type": "java.lang.String", diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 36c99a88b3f..aebca8fea73 100644 --- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -1488,7 +1488,7 @@ writes a PID file. Example: [indent=0] ---- org.springframework.context.ApplicationListener=\ - org.springframework.boot.actuate.system.ApplicationPidFileWriter,\ + org.springframework.boot.system.ApplicationPidFileWriter,\ org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter ---- diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index d2064f813ff..6022630bd86 100644 --- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -178,6 +178,18 @@ "description": "Configure the ANSI output.", "defaultValue": "detect" }, + { + "name": "spring.pid.file", + "type": "java.lang.String", + "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).", + "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter" + }, + { + "name": "spring.pid.fail-on-write-error", + "type": "java.lang.Boolean", + "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.", + "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter" + }, { "name": "spring.profiles.active", "type": "java.lang.String",