From b40975c2c172ca678e23861e7427be9c49cbc29e Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 27 Jul 2020 14:55:39 -0700 Subject: [PATCH] Adapt to Properties configuration changes in Spring Boot 2.4.0-SNAPSHOT. See Spring Boot Issues related to Spring Profiles: https://github.com/spring-projects/spring-boot/labels/theme%3A%20profiles And: https://github.com/spring-projects/spring-boot/labels/theme%3A%20config-data --- .../src/main/resources/application-server-site1.properties | 2 +- .../src/main/resources/application-server-site2.properties | 2 +- .../multi-site/src/main/resources/application.properties | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 spring-geode-samples/caching/multi-site/src/main/resources/application.properties diff --git a/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site1.properties b/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site1.properties index 129d9a5c..e1f343a8 100644 --- a/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site1.properties +++ b/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site1.properties @@ -2,6 +2,6 @@ gemfire.distributed-system-id=10 gemfire.remote-locators=localhost[12480] geode.distributed-system.remote.id=20 spring.application.name=BootGeodeMultiSiteCachingServerApplication-Site1 -spring.profiles.include=locator-manager,gateway-receiver,gateway-sender +#spring.profiles.include=locator-manager,gateway-receiver,gateway-sender spring.data.gemfire.locator.port=11235 spring.data.gemfire.manager.port=1199 diff --git a/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site2.properties b/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site2.properties index 0a984bee..9631fb21 100644 --- a/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site2.properties +++ b/spring-geode-samples/caching/multi-site/src/main/resources/application-server-site2.properties @@ -2,6 +2,6 @@ gemfire.distributed-system-id=20 gemfire.remote-locators=localhost[11235] geode.distributed-system.remote.id=10 spring.application.name=BootGeodeMultiSiteCachingServerApplication-Site2 -spring.profiles.include=locator-manager,gateway-receiver,gateway-sender +#spring.profiles.include=locator-manager,gateway-receiver,gateway-sender spring.data.gemfire.locator.port=12480 spring.data.gemfire.manager.port=2299 diff --git a/spring-geode-samples/caching/multi-site/src/main/resources/application.properties b/spring-geode-samples/caching/multi-site/src/main/resources/application.properties new file mode 100644 index 00000000..dfe45214 --- /dev/null +++ b/spring-geode-samples/caching/multi-site/src/main/resources/application.properties @@ -0,0 +1,4 @@ +# Spring Boot main application.properties for Multi-Site (WAN) Caching Example + +spring.profiles.group.server-site1=locator-manager,gateway-receiver,gateway-sender +spring.profiles.group.server-site2=locator-manager,gateway-receiver,gateway-sender