From 6586015d995b084344bf1e9b232aa1721dbbe7d9 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 20 Jul 2016 09:13:06 +0100 Subject: [PATCH] Move 'samples' into 'tests' folder Some of the samples are more like pure integratiuon tests (I wouldn't use them to copy code into a real app). So I put them with the other "test" projects. --- samples/pom.xml | 4 ---- tests/pom.xml | 4 ++++ {samples => tests}/samples-messaging-camel/.springBeans | 0 {samples => tests}/samples-messaging-camel/pom.xml | 0 .../src/main/java/com/example/BookDeleted.java | 0 .../src/main/java/com/example/BookDeleter.java | 0 .../src/main/java/com/example/BookReturned.java | 0 .../src/main/java/com/example/BookRouteConfiguration.java | 0 .../src/main/java/com/example/BookService.java | 0 .../src/main/java/com/example/CamelMessagingApplication.java | 0 .../groovy/com/example/CamelMessagingApplicationSpec.groovy | 0 {samples => tests}/samples-messaging-integration/.springBeans | 0 {samples => tests}/samples-messaging-integration/pom.xml | 0 .../src/main/java/com/example/BookDeleted.java | 0 .../src/main/java/com/example/BookListener.java | 0 .../src/main/java/com/example/BookReturned.java | 0 .../src/main/java/com/example/BookService.java | 0 .../java/com/example/IntegrationMessagingApplication.java | 0 .../src/main/resources/integration-context.xml | 0 .../com/example/IntegrationMessagingApplicationSpec.groovy | 0 {samples => tests}/samples-messaging-spring/.springBeans | 0 {samples => tests}/samples-messaging-spring/pom.xml | 0 .../src/main/java/com/example/BookDeleted.java | 0 .../src/main/java/com/example/BookListener.java | 0 .../src/main/java/com/example/BookReturned.java | 0 .../src/main/java/com/example/BookService.java | 0 .../src/main/java/com/example/SpringMessagingApplication.java | 0 .../src/test/groovy/com/example/SpringApplicationSpec.groovy | 0 {samples => tests}/samples-messaging-stream/.springBeans | 0 {samples => tests}/samples-messaging-stream/pom.xml | 0 .../src/main/java/com/example/BookDeleted.java | 0 .../src/main/java/com/example/BookListener.java | 0 .../src/main/java/com/example/BookReturned.java | 0 .../src/main/java/com/example/BookService.java | 0 .../src/main/java/com/example/DeleteSink.java | 0 .../src/main/java/com/example/StreamMessagingApplication.java | 0 .../src/main/resources/application.yml | 0 .../groovy/com/example/StreamMessagingApplicationSpec.groovy | 0 38 files changed, 4 insertions(+), 4 deletions(-) rename {samples => tests}/samples-messaging-camel/.springBeans (100%) rename {samples => tests}/samples-messaging-camel/pom.xml (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/BookDeleted.java (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/BookDeleter.java (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/BookReturned.java (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/BookService.java (100%) rename {samples => tests}/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java (100%) rename {samples => tests}/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy (100%) rename {samples => tests}/samples-messaging-integration/.springBeans (100%) rename {samples => tests}/samples-messaging-integration/pom.xml (100%) rename {samples => tests}/samples-messaging-integration/src/main/java/com/example/BookDeleted.java (100%) rename {samples => tests}/samples-messaging-integration/src/main/java/com/example/BookListener.java (100%) rename {samples => tests}/samples-messaging-integration/src/main/java/com/example/BookReturned.java (100%) rename {samples => tests}/samples-messaging-integration/src/main/java/com/example/BookService.java (100%) rename {samples => tests}/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java (100%) rename {samples => tests}/samples-messaging-integration/src/main/resources/integration-context.xml (100%) rename {samples => tests}/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy (100%) rename {samples => tests}/samples-messaging-spring/.springBeans (100%) rename {samples => tests}/samples-messaging-spring/pom.xml (100%) rename {samples => tests}/samples-messaging-spring/src/main/java/com/example/BookDeleted.java (100%) rename {samples => tests}/samples-messaging-spring/src/main/java/com/example/BookListener.java (100%) rename {samples => tests}/samples-messaging-spring/src/main/java/com/example/BookReturned.java (100%) rename {samples => tests}/samples-messaging-spring/src/main/java/com/example/BookService.java (100%) rename {samples => tests}/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java (100%) rename {samples => tests}/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy (100%) rename {samples => tests}/samples-messaging-stream/.springBeans (100%) rename {samples => tests}/samples-messaging-stream/pom.xml (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/BookDeleted.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/BookListener.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/BookReturned.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/BookService.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/DeleteSink.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java (100%) rename {samples => tests}/samples-messaging-stream/src/main/resources/application.yml (100%) rename {samples => tests}/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy (100%) diff --git a/samples/pom.xml b/samples/pom.xml index f52f720e48..5d27254ac8 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -21,10 +21,6 @@ wiremock-jetty wiremock-tomcat wiremock-undertow - samples-messaging-camel - samples-messaging-spring - samples-messaging-integration - samples-messaging-stream diff --git a/tests/pom.xml b/tests/pom.xml index df55cadd69..7c4215426c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -18,6 +18,10 @@ Spring Cloud Contract Tests + samples-messaging-camel + samples-messaging-spring + samples-messaging-stream + samples-messaging-integration spring-cloud-contract-stub-runner-camel spring-cloud-contract-stub-runner-integration spring-cloud-contract-stub-runner-stream diff --git a/samples/samples-messaging-camel/.springBeans b/tests/samples-messaging-camel/.springBeans similarity index 100% rename from samples/samples-messaging-camel/.springBeans rename to tests/samples-messaging-camel/.springBeans diff --git a/samples/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml similarity index 100% rename from samples/samples-messaging-camel/pom.xml rename to tests/samples-messaging-camel/pom.xml diff --git a/samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java b/tests/samples-messaging-camel/src/main/java/com/example/BookDeleted.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java rename to tests/samples-messaging-camel/src/main/java/com/example/BookDeleted.java diff --git a/samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java b/tests/samples-messaging-camel/src/main/java/com/example/BookDeleter.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java rename to tests/samples-messaging-camel/src/main/java/com/example/BookDeleter.java diff --git a/samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java b/tests/samples-messaging-camel/src/main/java/com/example/BookReturned.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java rename to tests/samples-messaging-camel/src/main/java/com/example/BookReturned.java diff --git a/samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java b/tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java rename to tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java diff --git a/samples/samples-messaging-camel/src/main/java/com/example/BookService.java b/tests/samples-messaging-camel/src/main/java/com/example/BookService.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/BookService.java rename to tests/samples-messaging-camel/src/main/java/com/example/BookService.java diff --git a/samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java b/tests/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java similarity index 100% rename from samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java rename to tests/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java diff --git a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy b/tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy similarity index 100% rename from samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy rename to tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy diff --git a/samples/samples-messaging-integration/.springBeans b/tests/samples-messaging-integration/.springBeans similarity index 100% rename from samples/samples-messaging-integration/.springBeans rename to tests/samples-messaging-integration/.springBeans diff --git a/samples/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml similarity index 100% rename from samples/samples-messaging-integration/pom.xml rename to tests/samples-messaging-integration/pom.xml diff --git a/samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java b/tests/samples-messaging-integration/src/main/java/com/example/BookDeleted.java similarity index 100% rename from samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java rename to tests/samples-messaging-integration/src/main/java/com/example/BookDeleted.java diff --git a/samples/samples-messaging-integration/src/main/java/com/example/BookListener.java b/tests/samples-messaging-integration/src/main/java/com/example/BookListener.java similarity index 100% rename from samples/samples-messaging-integration/src/main/java/com/example/BookListener.java rename to tests/samples-messaging-integration/src/main/java/com/example/BookListener.java diff --git a/samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java b/tests/samples-messaging-integration/src/main/java/com/example/BookReturned.java similarity index 100% rename from samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java rename to tests/samples-messaging-integration/src/main/java/com/example/BookReturned.java diff --git a/samples/samples-messaging-integration/src/main/java/com/example/BookService.java b/tests/samples-messaging-integration/src/main/java/com/example/BookService.java similarity index 100% rename from samples/samples-messaging-integration/src/main/java/com/example/BookService.java rename to tests/samples-messaging-integration/src/main/java/com/example/BookService.java diff --git a/samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java b/tests/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java similarity index 100% rename from samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java rename to tests/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java diff --git a/samples/samples-messaging-integration/src/main/resources/integration-context.xml b/tests/samples-messaging-integration/src/main/resources/integration-context.xml similarity index 100% rename from samples/samples-messaging-integration/src/main/resources/integration-context.xml rename to tests/samples-messaging-integration/src/main/resources/integration-context.xml diff --git a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy b/tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy similarity index 100% rename from samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy rename to tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy diff --git a/samples/samples-messaging-spring/.springBeans b/tests/samples-messaging-spring/.springBeans similarity index 100% rename from samples/samples-messaging-spring/.springBeans rename to tests/samples-messaging-spring/.springBeans diff --git a/samples/samples-messaging-spring/pom.xml b/tests/samples-messaging-spring/pom.xml similarity index 100% rename from samples/samples-messaging-spring/pom.xml rename to tests/samples-messaging-spring/pom.xml diff --git a/samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java b/tests/samples-messaging-spring/src/main/java/com/example/BookDeleted.java similarity index 100% rename from samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java rename to tests/samples-messaging-spring/src/main/java/com/example/BookDeleted.java diff --git a/samples/samples-messaging-spring/src/main/java/com/example/BookListener.java b/tests/samples-messaging-spring/src/main/java/com/example/BookListener.java similarity index 100% rename from samples/samples-messaging-spring/src/main/java/com/example/BookListener.java rename to tests/samples-messaging-spring/src/main/java/com/example/BookListener.java diff --git a/samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java b/tests/samples-messaging-spring/src/main/java/com/example/BookReturned.java similarity index 100% rename from samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java rename to tests/samples-messaging-spring/src/main/java/com/example/BookReturned.java diff --git a/samples/samples-messaging-spring/src/main/java/com/example/BookService.java b/tests/samples-messaging-spring/src/main/java/com/example/BookService.java similarity index 100% rename from samples/samples-messaging-spring/src/main/java/com/example/BookService.java rename to tests/samples-messaging-spring/src/main/java/com/example/BookService.java diff --git a/samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java b/tests/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java similarity index 100% rename from samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java rename to tests/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy b/tests/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy similarity index 100% rename from samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy rename to tests/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy diff --git a/samples/samples-messaging-stream/.springBeans b/tests/samples-messaging-stream/.springBeans similarity index 100% rename from samples/samples-messaging-stream/.springBeans rename to tests/samples-messaging-stream/.springBeans diff --git a/samples/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml similarity index 100% rename from samples/samples-messaging-stream/pom.xml rename to tests/samples-messaging-stream/pom.xml diff --git a/samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java b/tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java rename to tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java diff --git a/samples/samples-messaging-stream/src/main/java/com/example/BookListener.java b/tests/samples-messaging-stream/src/main/java/com/example/BookListener.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/BookListener.java rename to tests/samples-messaging-stream/src/main/java/com/example/BookListener.java diff --git a/samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java b/tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java rename to tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java diff --git a/samples/samples-messaging-stream/src/main/java/com/example/BookService.java b/tests/samples-messaging-stream/src/main/java/com/example/BookService.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/BookService.java rename to tests/samples-messaging-stream/src/main/java/com/example/BookService.java diff --git a/samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java b/tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java rename to tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java diff --git a/samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java b/tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java similarity index 100% rename from samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java rename to tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java diff --git a/samples/samples-messaging-stream/src/main/resources/application.yml b/tests/samples-messaging-stream/src/main/resources/application.yml similarity index 100% rename from samples/samples-messaging-stream/src/main/resources/application.yml rename to tests/samples-messaging-stream/src/main/resources/application.yml diff --git a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy similarity index 100% rename from samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy rename to tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy