From 3814201322eef3fe764e66604613368eb054eb89 Mon Sep 17 00:00:00 2001 From: "CORP\\vapadwal" Date: Wed, 3 Oct 2018 12:54:55 +0530 Subject: [PATCH] Fixed bug with context-path after upgrade to spring-boot 2.0 #683 --- .../common/impl/discovery/ServiceDiscovererImplConfig.java | 2 +- .../core/src/main/resources/application.properties | 2 +- .../core/src/main/resources/config/application.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/service/src/main/java/io/oasp/module/service/common/impl/discovery/ServiceDiscovererImplConfig.java b/modules/service/src/main/java/io/oasp/module/service/common/impl/discovery/ServiceDiscovererImplConfig.java index 62f67fa2e..9200f3158 100644 --- a/modules/service/src/main/java/io/oasp/module/service/common/impl/discovery/ServiceDiscovererImplConfig.java +++ b/modules/service/src/main/java/io/oasp/module/service/common/impl/discovery/ServiceDiscovererImplConfig.java @@ -29,7 +29,7 @@ public class ServiceDiscovererImplConfig implements ServiceDiscoverer, Applicati // @Value("${local.server.port}") private int localServerPort; - @Value("${server.context-path:}") + @Value("${server.servlet.context-path:}") private String contextPath; private ServiceConfig config; diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties index cdfd8cc48..80376d5ac 100644 --- a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties +++ b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties @@ -6,7 +6,7 @@ # server.port=8080 spring.application.name=${rootArtifactId} -server.context-path=/ +server.servlet.context-path=/ security.expose.error.details=false security.cors.enabled=false diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/config/application.properties b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/config/application.properties index 5dc4e65ae..322e2d2f5 100644 --- a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/config/application.properties +++ b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/config/application.properties @@ -6,7 +6,7 @@ # the config folder inside the WEB-INF/classes folder of the webapplication. server.port=8081 -server.context-path=/ +server.servlet.context-path=/ # Datasource for accessing the database # See https://github.com/oasp/oasp4j/wiki/guide-configuration#security