From d93830bede352622748f4102322215d1bc6fb5d1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 1 May 2019 18:45:20 -0700 Subject: [PATCH] Fix path variables (e.g. samples-dir) used in documentation and source files. Remove trailing path separator (/). --- spring-geode-docs/spring-geode-docs.gradle | 6 +++--- .../src/docs/asciidoc/guides/boot-actuator.adoc | 14 +++++++------- .../docs/asciidoc/guides/boot-configuration.adoc | 6 +++--- .../spring-geode-samples-boot-configuration.gradle | 2 +- .../resources/geode/bin/start-secure-cluster.sh | 2 +- .../resources/geode/bin/start-simple-cluster.sh | 2 +- .../src/main/resources/geode/bin/stop-cluster.sh | 2 +- .../main/resources/geode/config/gemfire.properties | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-geode-docs/spring-geode-docs.gradle b/spring-geode-docs/spring-geode-docs.gradle index e2884634..f6cf8f3c 100644 --- a/spring-geode-docs/spring-geode-docs.gradle +++ b/spring-geode-docs/spring-geode-docs.gradle @@ -37,10 +37,10 @@ asciidoctor { 'spring-data-geode-version' : "${springDataGeodeVersion}", 'spring-session-data-gemfire-version' : "${springSessionDataGeodeVersion}", 'spring-session-data-geode-version' : "${springSessionDataGeodeVersion}", - 'docs-dir' : rootProject.projectDir.path + '/spring-geode-docs/', + 'docs-dir' : rootProject.projectDir.path + '/spring-geode-docs', 'docs-src-dir' : rootProject.projectDir.path + '/spring-geode-docs/src/main/java', - 'examples-dir' : rootProject.projectDir.path + '/spring-geode-examples/', - 'samples-dir' : rootProject.projectDir.path + '/spring-geode-samples/' + 'examples-dir' : rootProject.projectDir.path + '/spring-geode-examples', + 'samples-dir' : rootProject.projectDir.path + '/spring-geode-samples' } javadoc { diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc index 17876884..9838ad37 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc @@ -44,7 +44,7 @@ However in this case, we simply model the `TemperatureReading` as: .TemperatureReading class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java[tags=class] ---- The `TemperatureReading` class is annotated with SDG's `@Region` mapping annotation to declare the Apache Geode Region @@ -61,7 +61,7 @@ For that, we introduce the simple `TemperatureEvent` base class: .TemperatureEvent class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java[tags=class] ---- `TemperatureEvent` is a Spring `ApplicationEvent` capable of being published to to Spring `@EventListeners` registered @@ -79,7 +79,7 @@ a Spring Data _Repository_: .TemperatureReadingRepository interface [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java[tags=class] ---- The _Repository_ showcases a an example, derived query methods, `findByTimestampGreaterThanAndTimestampLessThan(..)` @@ -101,7 +101,7 @@ or drops below freezing (32 °F): .TemperatureMonitor class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java[tags=class] ---- When the temperature changes, triggering our queries, we receive an event and publish an appropriate `TemperatureEvent` @@ -120,7 +120,7 @@ For that we have the `TemperatureSensor` class: .TemperatureSensor class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java[tags=class] ---- To generate a stream of temperatures, we use Spring's {spring-framework-docs}/integration.html#scheduling[Scheduling Service] @@ -150,7 +150,7 @@ using the `TemperatureSensor` class: .BootGeodeServerApplication main class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java[tags=class] ---- This class is annotated with `@SpringBootApplication` making it a proper Spring Boot application. It uses Spring Boot's @@ -186,7 +186,7 @@ Next, we need a client functioning as the "monitor" in our Temperature Service a .BootGeodeClientApplication main class [source,java] ---- -include::{samples-dir}boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java[tags=class] +include::{samples-dir}/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java[tags=class] ---- Again, this class is also annotated with `@SpringBootApplication` making it a proper Spring Boot application. It too diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc index 1ca720e7..6ad3f08d 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc @@ -37,7 +37,7 @@ namely a `Customer`. For this example, the `Customer` class is implemented as f .Customer class [source,java] ---- -include::{samples-dir}boot/configuration/src/main/java/example/app/crm/model/Customer.java[tags=class] +include::{samples-dir}/boot/configuration/src/main/java/example/app/crm/model/Customer.java[tags=class] ---- The `Customer` class uses https://projectlombok.org/[Project Lombok] to simplify the implementation so we can focus on @@ -63,7 +63,7 @@ using Spring Data's _Repository_ abstraction: .CustomerRepository inteface [source,java] ---- -include::{samples-dir}boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java[tags=class] +include::{samples-dir}/boot/configuration/src/main/java/example/app/crm/repo/CustomerRepository.java[tags=class] ---- `CustomerRepository` is a Spring Data `CrudRepository`. `CrudRepository` provides basic CRUD (Create, Read, Update, @@ -90,7 +90,7 @@ to drive the interactions with Customers: .CustomerServiceApplication class [source,java] ---- -include::{samples-dir}boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java[tags=class] +include::{samples-dir}/boot/configuration/src/main/java/example/app/crm/CustomerServiceApplication.java[tags=class] ---- The `CustomerServiceApplication` class is annotated with `@SpringBootApplication`. Therefore, the main class is diff --git a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle index 452f4e77..936b02b3 100644 --- a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle +++ b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle @@ -26,7 +26,7 @@ processResources { file.filter ReplaceTokens, tokens: [ 'project-dir' : rootProject.projectDir.path, 'project-version' : project.version, - 'samples-dir' : rootProject.projectDir.path + '/spring-geode-samples/' + 'samples-dir' : rootProject.projectDir.path + '/spring-geode-samples' ] } } diff --git a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-secure-cluster.sh b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-secure-cluster.sh index 335881c4..a349d488 100644 --- a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-secure-cluster.sh +++ b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-secure-cluster.sh @@ -1,3 +1,3 @@ #!/bin/bash -gfsh -e "run --file=@samples-dir@boot/configuration/build/resources/main/geode/bin/start-secure-cluster.gfsh" +gfsh -e "run --file=@samples-dir@/boot/configuration/build/resources/main/geode/bin/start-secure-cluster.gfsh" diff --git a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-simple-cluster.sh b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-simple-cluster.sh index adc022ee..df0d4b70 100644 --- a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-simple-cluster.sh +++ b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/start-simple-cluster.sh @@ -1,3 +1,3 @@ #!/bin/bash -gfsh -e "run --file=@samples-dir@boot/configuration/src/main/resources/geode/bin/start-simple-cluster.gfsh" +gfsh -e "run --file=@samples-dir@/boot/configuration/src/main/resources/geode/bin/start-simple-cluster.gfsh" diff --git a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/stop-cluster.sh b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/stop-cluster.sh index 8ae6baef..bf0f747c 100644 --- a/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/stop-cluster.sh +++ b/spring-geode-samples/boot/configuration/src/main/resources/geode/bin/stop-cluster.sh @@ -1,3 +1,3 @@ #!/bin/bash -gfsh -e "run --file=@samples-dir@boot/configuration/src/main/resources/geode/bin/stop-cluster.gfsh" +gfsh -e "run --file=@samples-dir@/boot/configuration/src/main/resources/geode/bin/stop-cluster.gfsh" diff --git a/spring-geode-samples/boot/configuration/src/main/resources/geode/config/gemfire.properties b/spring-geode-samples/boot/configuration/src/main/resources/geode/config/gemfire.properties index 58dc19a2..22641cb3 100644 --- a/spring-geode-samples/boot/configuration/src/main/resources/geode/config/gemfire.properties +++ b/spring-geode-samples/boot/configuration/src/main/resources/geode/config/gemfire.properties @@ -7,8 +7,8 @@ security-username=test security-password=test ssl-enabled-components=locator,server ssl-require-authentication=false -ssl-keystore=@samples-dir@boot/configuration/build/resources/main/example-trusted-keystore.jks +ssl-keystore=@samples-dir@/boot/configuration/build/resources/main/example-trusted-keystore.jks ssl-keystore-password=s3cr3t ssl-keystore-type=JKS -ssl-truststore=@samples-dir@boot/configuration/build/resources/main/example-trusted-keystore.jks +ssl-truststore=@samples-dir@/boot/configuration/build/resources/main/example-trusted-keystore.jks ssl-truststore-password=s3cr3t