From 2ed162a0bea3bf5262d307ff93a4b3bc96a12415 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 15 Dec 2017 10:24:14 +0100 Subject: [PATCH] Fix outdated references to server.context-path Closes gh-11358 --- .../autoconfigure/endpoint/web/WebEndpointProperties.java | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- .../src/main/asciidoc/production-ready-features.adoc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java index 24c85b1b0e..bb1cd0a9e1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java @@ -35,7 +35,7 @@ import org.springframework.util.StringUtils; public class WebEndpointProperties { /** - * Base path for Web endpoints. Relative to server.context-path or + * Base path for Web endpoints. Relative to server.servlet.context-path or * management.server.context-path if management.server.port is configured. */ private String basePath = "/actuator"; diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 970c0b413e..4fe7d392f5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1116,7 +1116,7 @@ content into your application. Rather, pick only the properties that you need. management.endpoints.web.enabled=true # Whether web endpoints are enabled management.endpoints.web.expose=info,health # Endpoint IDs that should be exposed or '*' for all. management.endpoints.web.exclude= # Endpoint IDs that should be excluded. - management.endpoints.web.base-path=/actuator # Base path for Web endpoints. Relative to server.context-path or management.server.context-path if management.server.port is configured. + management.endpoints.web.base-path=/actuator # Base path for Web endpoints. Relative to server.servlet.context-path or management.server.context-path if management.server.port is configured. management.endpoints.web.path-mapping= # Mapping between endpoint IDs and the path that should expose them. # ENDPOINTS CORS CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/web/servlet/CorsEndpointProperties.{sc-ext}[CorsEndpointProperties]) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index a87a822c79..e3355b6863 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -689,9 +689,9 @@ The preceding `application.properties` example changes the endpoint from NOTE: Unless the management port has been configured to <>, `management.endpoints.web.base-path` is relative to `server.context-path`. -If `management.server.port` is configured, `management.endpoints.web.base-path` is -relative to `management.server.servlet.context-path`. +HTTP port>>, `management.endpoints.web.base-path` is relative to +`server.servlet.context-path`. If `management.server.port` is configured, +`management.endpoints.web.base-path` is relative to `management.server.context-path`.