From 77703c0003d2cd47db48b35f500c16c83841a74d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 15 Jul 2016 14:34:40 +0200 Subject: [PATCH] Migrated docs to new folders --- docs/src/main/asciidoc/verifier/contract.adoc | 2 +- docs/src/main/asciidoc/verifier/messaging.adoc | 2 +- docs/src/main/asciidoc/verifier/rest.adoc | 2 +- .../asciidoc/verifier/spring-cloud-contract-verifier.adoc | 1 + docs/src/main/asciidoc/verifier/stubrunner.adoc | 2 +- scripts/generateDocs.sh | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/src/main/asciidoc/verifier/contract.adoc b/docs/src/main/asciidoc/verifier/contract.adoc index 84d42c6c1d..b4b289e823 100644 --- a/docs/src/main/asciidoc/verifier/contract.adoc +++ b/docs/src/main/asciidoc/verifier/contract.adoc @@ -165,7 +165,7 @@ include::{verifier_core_path}/src/test/groovy/org/springframework/cloud/contract [source,groovy,indent=0] ---- -include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0] +include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0] ---- === JAX-RS support diff --git a/docs/src/main/asciidoc/verifier/messaging.adoc b/docs/src/main/asciidoc/verifier/messaging.adoc index 860e85ef99..72df4c53ac 100644 --- a/docs/src/main/asciidoc/verifier/messaging.adoc +++ b/docs/src/main/asciidoc/verifier/messaging.adoc @@ -138,7 +138,7 @@ Example of Spring Cloud Contract Verifier Gradle setup: [source,groovy,indent=0] ---- -include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0] +include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0] ---- ==== Maven Setup diff --git a/docs/src/main/asciidoc/verifier/rest.adoc b/docs/src/main/asciidoc/verifier/rest.adoc index b8d0ef0559..eb292642dd 100644 --- a/docs/src/main/asciidoc/verifier/rest.adoc +++ b/docs/src/main/asciidoc/verifier/rest.adoc @@ -162,7 +162,7 @@ When using Spring Cloud Contract Verifier in default MockMvc you need to create [source,groovy,indent=0] ---- -include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0] +include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0] ---- In case of using `Explicit` mode, you can use base class to initialize the whole tested app similarly as in regular integration tests. In case of `JAXRSCLIENT` mode this base class diff --git a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc index dbc552453f..4ecd997026 100644 --- a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc +++ b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc @@ -1,4 +1,5 @@ :core_path: ../../../../.. +:plugins_path: ../../../../../spring-cloud-contract-tools :verifier_root_path: {core_path}/spring-cloud-contract-verifier :samples_path: {core_path}/samples :verifier_core_path: {verifier_root_path}/spring-cloud-contract-verifier-core diff --git a/docs/src/main/asciidoc/verifier/stubrunner.adoc b/docs/src/main/asciidoc/verifier/stubrunner.adoc index 904d43bab4..2066b7fb2f 100644 --- a/docs/src/main/asciidoc/verifier/stubrunner.adoc +++ b/docs/src/main/asciidoc/verifier/stubrunner.adoc @@ -28,7 +28,7 @@ Example of Spring Cloud Contract Verifier Gradle setup: [source,groovy,indent=0] ---- -include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0] +include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0] ---- ==== Maven diff --git a/scripts/generateDocs.sh b/scripts/generateDocs.sh index 5e8445ce7d..713841f1ab 100755 --- a/scripts/generateDocs.sh +++ b/scripts/generateDocs.sh @@ -14,7 +14,7 @@ echo "Building main docs" ./mvnw clean install -P docs -DskipTests=true --pl docs echo "Building maven plugin docs" -./mvnw site site:stage -DskipTests=true --pl spring-cloud-contract-maven-plugin +./mvnw site site:stage -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin echo "Copying generated maven plugin docs to main docs" -cp -r spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin \ No newline at end of file +cp -r spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin \ No newline at end of file