diff --git a/samples/samples-messaging-camel/.springBeans b/samples/samples-messaging-camel/.springBeans
index d6d529735f..053f88a382 100644
--- a/samples/samples-messaging-camel/.springBeans
+++ b/samples/samples-messaging-camel/.springBeans
@@ -7,6 +7,7 @@
+ java:com.example.CamelMessagingApplication
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleted.java b/samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java
similarity index 93%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleted.java
rename to samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java
index 4ca43d7594..76d7170062 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleted.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleter.java b/samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java
similarity index 96%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleter.java
rename to samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java
index 91b6deb88d..5fdb9312ad 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookDeleter.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookReturned.java b/samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java
similarity index 93%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookReturned.java
rename to samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java
index 15feaabf05..f077ef0817 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookReturned.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookRouteConfiguration.java b/samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java
similarity index 96%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookRouteConfiguration.java
rename to samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java
index ab268f1c21..2241fde865 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookRouteConfiguration.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.RoutesBuilder;
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookService.java b/samples/samples-messaging-camel/src/main/java/com/example/BookService.java
similarity index 95%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookService.java
rename to samples/samples-messaging-camel/src/main/java/com/example/BookService.java
index a963007f4c..0ad648ddbc 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/BookService.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/BookService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import org.apache.camel.Exchange;
import org.slf4j.Logger;
diff --git a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplication.java b/samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java
similarity index 93%
rename from samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplication.java
rename to samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java
index e12116f353..eed91cde43 100644
--- a/samples/samples-messaging-camel/src/main/java/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplication.java
+++ b/samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
similarity index 98%
rename from samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy
rename to samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
index 60c4da297b..62dbd2109e 100644
--- a/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.camel
+package com.example
+import com.example.BookDeleter;
+import com.example.CamelMessagingApplication;
import com.jayway.jsonpath.DocumentContext
import com.jayway.jsonpath.JsonPath
import com.toomuchcoding.jsonassert.JsonAssertion
diff --git a/samples/samples-messaging-integration/.springBeans b/samples/samples-messaging-integration/.springBeans
index d6d529735f..f74f9fabe3 100644
--- a/samples/samples-messaging-integration/.springBeans
+++ b/samples/samples-messaging-integration/.springBeans
@@ -7,6 +7,7 @@
+ java:com.example.IntegrationMessagingApplication
diff --git a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookDeleted.java b/samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java
similarity index 93%
rename from samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookDeleted.java
rename to samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java
index a4d52aa3b9..76d7170062 100644
--- a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookDeleted.java
+++ b/samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java b/samples/samples-messaging-integration/src/main/java/com/example/BookListener.java
similarity index 93%
rename from samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java
rename to samples/samples-messaging-integration/src/main/java/com/example/BookListener.java
index f4f8349d2a..b7bf900ab1 100644
--- a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java
+++ b/samples/samples-messaging-integration/src/main/java/com/example/BookListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -50,5 +50,5 @@ public class BookListener {
bookSuccessfulyDeleted.set(true);
}
- private AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false);
+ public AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false);
}
diff --git a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookReturned.java b/samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java
similarity index 93%
rename from samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookReturned.java
rename to samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java
index d86008439e..f077ef0817 100644
--- a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookReturned.java
+++ b/samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java b/samples/samples-messaging-integration/src/main/java/com/example/BookService.java
similarity index 96%
rename from samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java
rename to samples/samples-messaging-integration/src/main/java/com/example/BookService.java
index f4e17eea14..e516df3b4a 100644
--- a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java
+++ b/samples/samples-messaging-integration/src/main/java/com/example/BookService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplication.java b/samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java
similarity index 93%
rename from samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplication.java
rename to samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java
index 5e6dc1aa17..b58f89ab28 100644
--- a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplication.java
+++ b/samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/samples/samples-messaging-integration/src/main/resources/integration-context.xml b/samples/samples-messaging-integration/src/main/resources/integration-context.xml
index 3dd916e22f..54bf16c231 100644
--- a/samples/samples-messaging-integration/src/main/resources/integration-context.xml
+++ b/samples/samples-messaging-integration/src/main/resources/integration-context.xml
@@ -32,17 +32,17 @@
ref="bookListener"
method="returnBook"/>
-
-
-
+
diff --git a/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
similarity index 97%
rename from samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy
rename to samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
index 8ccf400100..674dd4308c 100644
--- a/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
@@ -14,22 +14,24 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging
+package com.example
+
+import javax.inject.Inject
-import com.jayway.jsonpath.DocumentContext
-import com.jayway.jsonpath.JsonPath
-import com.toomuchcoding.jsonassert.JsonAssertion
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.SpringApplicationContextLoader
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext
import org.springframework.test.context.ContextConfiguration
+
import spock.lang.Specification
-import javax.inject.Inject
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import com.toomuchcoding.jsonassert.JsonAssertion
// Context configuration would end up in base class
@ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringApplicationContextLoader)
@DirtiesContext
diff --git a/samples/samples-messaging-spring/.springBeans b/samples/samples-messaging-spring/.springBeans
index d6d529735f..46e2233a4e 100644
--- a/samples/samples-messaging-spring/.springBeans
+++ b/samples/samples-messaging-spring/.springBeans
@@ -7,6 +7,7 @@
+ java:com.example.SpringMessagingApplication
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java b/samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java
similarity index 93%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java
rename to samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java
index 19c6288bbe..76d7170062 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java
+++ b/samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookListener.java b/samples/samples-messaging-spring/src/main/java/com/example/BookListener.java
similarity index 97%
rename from samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookListener.java
rename to samples/samples-messaging-spring/src/main/java/com/example/BookListener.java
index 14d717cf82..ab14cd6b51 100644
--- a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookListener.java
+++ b/samples/samples-messaging-spring/src/main/java/com/example/BookListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java b/samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java
similarity index 93%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java
rename to samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java
index eeb19ce99b..f077ef0817 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java
+++ b/samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookService.java b/samples/samples-messaging-spring/src/main/java/com/example/BookService.java
similarity index 96%
rename from samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookService.java
rename to samples/samples-messaging-spring/src/main/java/com/example/BookService.java
index dcb434044d..5e7d5f4ae3 100644
--- a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/BookService.java
+++ b/samples/samples-messaging-spring/src/main/java/com/example/BookService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
import javax.jms.JMSException;
import javax.jms.Message;
diff --git a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/SpringMessagingApplication.java b/samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java
similarity index 93%
rename from samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/SpringMessagingApplication.java
rename to samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java
index f082532983..021e288013 100644
--- a/samples/samples-messaging-spring/src/main/java/org/springframework/cloud/contract/verifier/samples/spring/SpringMessagingApplication.java
+++ b/samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
similarity index 96%
rename from samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy
rename to samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
index b88ea3cdd1..6c20d22ff2 100644
--- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
@@ -14,25 +14,26 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring
+package com.example
-import com.jayway.jsonpath.DocumentContext
-import com.jayway.jsonpath.JsonPath
-import com.toomuchcoding.jsonassert.JsonAssertion
+import javax.inject.Inject
-import org.junit.BeforeClass;
+import org.junit.BeforeClass
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.SpringApplicationContextLoader
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext
import org.springframework.test.context.ContextConfiguration
+
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
-import javax.inject.Inject
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import com.toomuchcoding.jsonassert.JsonAssertion
/**
* SPIKE ON TESTS FROM NOTES IN MessagingSpec
*/
diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessageBuilder.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy
similarity index 95%
rename from samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessageBuilder.groovy
rename to samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy
index fdd0094caf..b92f23c0d3 100644
--- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessageBuilder.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder
diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessaging.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy
similarity index 97%
rename from samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessaging.groovy
rename to samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy
index bd7e93503b..83be926169 100644
--- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ContractVerifierSpringMessaging.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
import org.slf4j.Logger
import org.slf4j.LoggerFactory
diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ManualContractVerifierConfiguration.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy
similarity index 94%
rename from samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ManualContractVerifierConfiguration.groovy
rename to samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy
index eb9966e3b3..4831213664 100644
--- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/ManualContractVerifierConfiguration.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
import org.springframework.context.annotation.Bean
diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/SpringMessage.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy
similarity index 96%
rename from samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/SpringMessage.groovy
rename to samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy
index 28239443a1..f8596e087a 100644
--- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/config/SpringMessage.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
import org.springframework.jms.core.MessageCreator
diff --git a/samples/samples-messaging-stream/.springBeans b/samples/samples-messaging-stream/.springBeans
index d6d529735f..afe5f5aa9d 100644
--- a/samples/samples-messaging-stream/.springBeans
+++ b/samples/samples-messaging-stream/.springBeans
@@ -7,6 +7,7 @@
+ java:com.example.StreamMessagingApplication
diff --git a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java b/samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java
similarity index 93%
rename from samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java
rename to samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java
index 19c6288bbe..76d7170062 100644
--- a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookDeleted.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java b/samples/samples-messaging-stream/src/main/java/com/example/BookListener.java
similarity index 97%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java
rename to samples/samples-messaging-stream/src/main/java/com/example/BookListener.java
index 86cf23b1b0..b4c4286827 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookListener.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/BookListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java b/samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java
similarity index 93%
rename from samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java
rename to samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java
index eeb19ce99b..f077ef0817 100644
--- a/samples/samples-messaging-integration/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookReturned.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import java.io.Serializable;
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java b/samples/samples-messaging-stream/src/main/java/com/example/BookService.java
similarity index 96%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java
rename to samples/samples-messaging-stream/src/main/java/com/example/BookService.java
index c6b1eea6dc..ae7dc51a87 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/BookService.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/BookService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/DeleteSink.java b/samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java
similarity index 93%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/DeleteSink.java
rename to samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java
index f2da8f6449..32240b5160 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/DeleteSink.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import org.springframework.cloud.stream.annotation.Input;
import org.springframework.cloud.stream.messaging.Sink;
diff --git a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplication.java b/samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java
similarity index 94%
rename from samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplication.java
rename to samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java
index fbeff3c4b5..84c4daaf77 100644
--- a/samples/samples-messaging-stream/src/main/java/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplication.java
+++ b/samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
similarity index 97%
rename from samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy
rename to samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
index 7fb1c9eb97..ee8857cc5f 100644
--- a/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
@@ -14,22 +14,24 @@
* limitations under the License.
*/
-package org.springframework.cloud.contract.verifier.samples.messaging
+package com.example
+
+import javax.inject.Inject
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.cloud.contract.spec.Contract
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
+import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.ContextConfiguration
+
+import spock.lang.Specification
import com.jayway.jsonpath.DocumentContext
import com.jayway.jsonpath.JsonPath
import com.toomuchcoding.jsonassert.JsonAssertion
-import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration
-import spock.lang.Specification
-
-import javax.inject.Inject
/**
* SPIKE ON TESTS FROM NOTES IN MessagingSpec
*/