diff --git a/docs/pom.xml b/docs/pom.xml index 4445e3ab1..81479b239 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,15 +4,15 @@ 4.0.0 org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT - spring-cloud-streams-docs + spring-cloud-stream-docs pom Spring Cloud Streams Docs Spring Cloud Docs - spring-cloud-streams + spring-cloud-stream ${basedir}/.. diff --git a/pom.xml b/pom.xml index 18e958cca..0b6958b0e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT pom @@ -12,9 +12,9 @@ - https://github.com/spring-cloud/spring-cloud-streams - scm:git:git://github.com/spring-cloud/spring-cloud-streams.git - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-streams.git + https://github.com/spring-cloud/spring-cloud-stream + scm:git:git://github.com/spring-cloud/spring-cloud-stream.git + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-stream.git HEAD @@ -26,11 +26,11 @@ 4.2.0.M2 - spring-cloud-streams - spring-cloud-streams-bindings - spring-cloud-streams-codec - spring-cloud-streams-common - spring-cloud-streams-samples + spring-cloud-stream + spring-cloud-stream-bindings + spring-cloud-stream-codec + spring-cloud-stream-common + spring-cloud-stream-samples docs @@ -51,7 +51,7 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream ${project.version} @@ -61,12 +61,12 @@ org.springframework.cloud - spring-cloud-streams-codec + spring-cloud-stream-codec ${project.version} org.springframework.cloud - spring-cloud-streams-common + spring-cloud-stream-common ${project.version} @@ -76,17 +76,17 @@ org.springframework.cloud - spring-cloud-streams-binding-local + spring-cloud-stream-binding-local ${project.version} org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis ${project.version} org.springframework.cloud - spring-cloud-streams-binding-rabbit + spring-cloud-stream-binding-rabbit ${project.version} diff --git a/spring-cloud-streams-bindings/pom.xml b/spring-cloud-stream-bindings/pom.xml similarity index 81% rename from spring-cloud-streams-bindings/pom.xml rename to spring-cloud-stream-bindings/pom.xml index 95a0efbce..810c9cf28 100644 --- a/spring-cloud-streams-bindings/pom.xml +++ b/spring-cloud-stream-bindings/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent pom http://projects.spring.io/spring-xd/ @@ -12,7 +12,7 @@ org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT @@ -20,24 +20,24 @@ 2.6.0 - spring-cloud-streams-binding-spi - spring-cloud-streams-binding-test - spring-cloud-streams-binding-local - spring-cloud-streams-binding-rabbit - spring-cloud-streams-binding-redis - spring-cloud-streams-binding-kafka + spring-cloud-stream-binding-spi + spring-cloud-stream-binding-test + spring-cloud-stream-binding-local + spring-cloud-stream-binding-rabbit + spring-cloud-stream-binding-redis + spring-cloud-stream-binding-kafka org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi ${project.version} org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test ${project.version} test diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/pom.xml similarity index 89% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/pom.xml index 6ce0ea980..2919ea699 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-binding-kafka + spring-cloud-stream-binding-kafka jar - spring-cloud-streams-binding-kafka + spring-cloud-stream-binding-kafka Kafka binding implementation org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -24,11 +24,11 @@ org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test org.springframework.integration diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/IntegerEncoderDecoder.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/IntegerEncoderDecoder.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/IntegerEncoderDecoder.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/IntegerEncoderDecoder.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/KafkaMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/KafkaMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/KafkaMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/KafkaMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/WindowingOffsetManager.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/WindowingOffsetManager.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/WindowingOffsetManager.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/java/org/springframework/xd/dirt/integration/kafka/WindowingOffsetManager.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/resources/META-INF/spring-xd/bus/kafka-bus.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/resources/META-INF/spring-xd/bus/kafka-bus.xml similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/main/resources/META-INF/spring-xd/bus/kafka-bus.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/main/resources/META-INF/spring-xd/bus/kafka-bus.xml diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaTestMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaTestMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaTestMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/KafkaTestMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawKafkaPartitionTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawKafkaPartitionTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawKafkaPartitionTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawKafkaPartitionTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawModeKafkaMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawModeKafkaMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawModeKafkaMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/bus/kafka/RawModeKafkaMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/EmbeddedZookeeper.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/EmbeddedZookeeper.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/EmbeddedZookeeper.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/EmbeddedZookeeper.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/KafkaTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/KafkaTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/KafkaTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/KafkaTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/TestKafkaCluster.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/TestKafkaCluster.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/TestKafkaCluster.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-kafka/src/test/java/org/springframework/xd/dirt/integration/kafka/TestKafkaCluster.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-local/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-local/pom.xml similarity index 72% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-local/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-local/pom.xml index 634bded29..bf8d5bef1 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-local/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-local/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-binding-local + spring-cloud-stream-binding-local jar - spring-cloud-streams-binding-local + spring-cloud-stream-binding-local Local(in memory) binding implementation org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -21,11 +21,11 @@ org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/main/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/main/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/main/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/main/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/main/resources/META-INF/spring-xd/bus/local-bus.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/main/resources/META-INF/spring-xd/bus/local-bus.xml similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/main/resources/META-INF/spring-xd/bus/local-bus.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/main/resources/META-INF/spring-xd/bus/local-bus.xml diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/test/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/test/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-local/src/test/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-local/src/test/java/org/springframework/xd/dirt/integration/bus/local/LocalMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/pom.xml similarity index 78% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/pom.xml index ea754bdfe..5831bafc7 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-binding-rabbit + spring-cloud-stream-binding-rabbit jar - spring-cloud-streams-binding-rabbit + spring-cloud-stream-binding-rabbit RabbitMQ binding implementation org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -21,11 +21,11 @@ org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test org.springframework.boot diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/ConnectionFactorySettings.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/ConnectionFactorySettings.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/ConnectionFactorySettings.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/ConnectionFactorySettings.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactory.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactory.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactory.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactory.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleaner.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleaner.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleaner.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleaner.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/package-info.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/package-info.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/package-info.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/java/org/springframework/xd/dirt/integration/rabbit/package-info.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/resources/META-INF/spring-xd/bus/rabbit-bus.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/resources/META-INF/spring-xd/bus/rabbit-bus.xml similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/main/resources/META-INF/spring-xd/bus/rabbit-bus.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/main/resources/META-INF/spring-xd/bus/rabbit-bus.xml diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryIntegrationTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryIntegrationTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryIntegrationTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryIntegrationTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/LocalizedQueueConnectionFactoryTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitAdminTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitAdminTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitAdminTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitAdminTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleanerTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleanerTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleanerTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitBusCleanerTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/java/org/springframework/xd/dirt/integration/rabbit/RabbitTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/resources/log4j.properties b/spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/resources/log4j.properties similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-rabbit/src/test/resources/log4j.properties rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-rabbit/src/test/resources/log4j.properties diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/pom.xml similarity index 84% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/pom.xml index 5e4c5ad33..62dfdb2ee 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis jar - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis Redis binding implementation org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -21,11 +21,11 @@ org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test org.springframework.boot diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/RedisMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/RedisMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/RedisMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/RedisMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/package-info.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/package-info.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/package-info.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/java/org/springframework/xd/dirt/integration/redis/package-info.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/resources/META-INF/spring-xd/bus/redis-bus.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/resources/META-INF/spring-xd/bus/redis-bus.xml similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/main/resources/META-INF/spring-xd/bus/redis-bus.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/main/resources/META-INF/spring-xd/bus/redis-bus.xml diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisTestMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisTestMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisTestMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/bus/redis/RedisTestMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/AbstractRedisSerializerTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/AbstractRedisSerializerTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/AbstractRedisSerializerTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/AbstractRedisSerializerTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisPublishingMessageHandlerTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisPublishingMessageHandlerTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisPublishingMessageHandlerTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisPublishingMessageHandlerTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueInboundChannelAdapterTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueInboundChannelAdapterTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueInboundChannelAdapterTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueInboundChannelAdapterTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueOutboundChannelAdapterTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueOutboundChannelAdapterTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueOutboundChannelAdapterTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisQueueOutboundChannelAdapterTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-redis/src/test/java/org/springframework/xd/dirt/integration/redis/RedisTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/pom.xml similarity index 85% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/pom.xml index 96d001dea..a4e3901bf 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi jar - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi SPI for binding implementations org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -21,7 +21,7 @@ org.springframework.cloud - spring-cloud-streams-codec + spring-cloud-stream-codec org.springframework diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractBusPropertiesAccessor.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractBusPropertiesAccessor.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractBusPropertiesAccessor.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractBusPropertiesAccessor.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/Binding.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/Binding.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/Binding.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/Binding.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusCleaner.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusCleaner.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusCleaner.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusCleaner.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusProperties.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusProperties.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusProperties.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusProperties.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusUtils.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusUtils.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusUtils.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/BusUtils.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/EmbeddedHeadersMessageConverter.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/EmbeddedHeadersMessageConverter.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/EmbeddedHeadersMessageConverter.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/EmbeddedHeadersMessageConverter.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusException.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusException.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusException.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusException.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageValues.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageValues.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageValues.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/MessageValues.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionKeyExtractorStrategy.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionKeyExtractorStrategy.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionKeyExtractorStrategy.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionKeyExtractorStrategy.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionSelectorStrategy.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionSelectorStrategy.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionSelectorStrategy.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionSelectorStrategy.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java similarity index 92% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java index bbc2798a1..0506ef210 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitAdminException.java @@ -17,7 +17,7 @@ package org.springframework.xd.dirt.integration.bus; -import org.springframework.cloud.streams.exception.CloudStreamsRuntimeException; +import org.springframework.cloud.stream.exception.CloudStreamsRuntimeException; /** * Exceptions thrown while interfacing with the RabbitMQ admin plugin. diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitManagementUtils.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitManagementUtils.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitManagementUtils.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/RabbitManagementUtils.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/StringConvertingContentTypeResolver.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/StringConvertingContentTypeResolver.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/StringConvertingContentTypeResolver.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/StringConvertingContentTypeResolver.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/XdHeaders.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/XdHeaders.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/XdHeaders.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/main/java/org/springframework/xd/dirt/integration/bus/XdHeaders.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/test/java/org/springframework/xd/dirt/integration/bus/MessageConverterTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/test/java/org/springframework/xd/dirt/integration/bus/MessageConverterTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-spi/src/test/java/org/springframework/xd/dirt/integration/bus/MessageConverterTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-spi/src/test/java/org/springframework/xd/dirt/integration/bus/MessageConverterTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/README.md b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/README.md similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/README.md rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/README.md diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/pom.xml b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/pom.xml similarity index 93% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/pom.xml rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/pom.xml index b8888e982..1f88730b6 100644 --- a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/pom.xml +++ b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/pom.xml @@ -4,16 +4,16 @@ 4.0.0 org.springframework.cloud - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test 1.0.0.BUILD-SNAPSHOT jar - spring-cloud-streams-binding-test + spring-cloud-stream-binding-test Test support for binding implementations org.springframework.cloud - spring-cloud-streams-bindings-parent + spring-cloud-stream-bindings-parent 1.0.0.BUILD-SNAPSHOT @@ -110,11 +110,11 @@ org.springframework.cloud - spring-cloud-streams-binding-spi + spring-cloud-stream-binding-spi org.springframework.cloud - spring-cloud-streams-codec + spring-cloud-stream-codec diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractMessageBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractMessageBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractMessageBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractMessageBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractTestMessageBus.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractTestMessageBus.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractTestMessageBus.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/AbstractTestMessageBus.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BrokerBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BrokerBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BrokerBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BrokerBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BusTestUtils.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BusTestUtils.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BusTestUtils.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/BusTestUtils.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionCapableBusTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionCapableBusTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionCapableBusTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionCapableBusTests.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/PartitionTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/Spy.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/Spy.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/Spy.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/dirt/integration/bus/Spy.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/test/AbstractExternalResourceTestSupport.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/test/AbstractExternalResourceTestSupport.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/test/AbstractExternalResourceTestSupport.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/test/AbstractExternalResourceTestSupport.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/test/TestUtils.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/test/TestUtils.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/main/java/org/springframework/xd/test/TestUtils.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/main/java/org/springframework/xd/test/TestUtils.java diff --git a/spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusSupportTests.java b/spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusSupportTests.java similarity index 100% rename from spring-cloud-streams-bindings/spring-cloud-streams-binding-test/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusSupportTests.java rename to spring-cloud-stream-bindings/spring-cloud-stream-binding-test/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusSupportTests.java diff --git a/spring-cloud-streams-codec/pom.xml b/spring-cloud-stream-codec/pom.xml similarity index 87% rename from spring-cloud-streams-codec/pom.xml rename to spring-cloud-stream-codec/pom.xml index 534d38577..1844cc3a1 100644 --- a/spring-cloud-streams-codec/pom.xml +++ b/spring-cloud-stream-codec/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-codec + spring-cloud-stream-codec jar - spring-cloud-streams-codec + spring-cloud-stream-codec Serialization library used by transport org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT @@ -21,7 +21,7 @@ org.springframework.cloud - spring-cloud-streams-common + spring-cloud-stream-common com.esotericsoftware diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/AbstractCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/AbstractCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/AbstractCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/AbstractCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/CompositeCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/CompositeCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/CompositeCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/CompositeCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/MultiTypeCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/MultiTypeCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/MultiTypeCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/MultiTypeCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java similarity index 92% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java index c9b653e3d..48b9fc651 100644 --- a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java +++ b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/SerializationException.java @@ -17,7 +17,7 @@ package org.springframework.xd.dirt.integration.bus.serializer; -import org.springframework.cloud.streams.exception.CloudStreamsRuntimeException; +import org.springframework.cloud.stream.exception.CloudStreamsRuntimeException; /** * Thrown when something goes wrong with inter-module communication. diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoMultiTypeCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoMultiTypeCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoMultiTypeCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoMultiTypeCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/AbstractKryoRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeKryoRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeKryoRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeKryoRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeKryoRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileKryoRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileKryoRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileKryoRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileKryoRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileSerializer.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileSerializer.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileSerializer.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/FileSerializer.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassListRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassListRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassListRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassListRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassMapRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassMapRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassMapRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoClassMapRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrationRegistrar.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrationRegistrar.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrationRegistrar.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoRegistrationRegistrar.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/PojoCodec.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/PojoCodec.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/PojoCodec.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/PojoCodec.java diff --git a/spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/package-info.java b/spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/package-info.java similarity index 100% rename from spring-cloud-streams-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/package-info.java rename to spring-cloud-stream-codec/src/main/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/package-info.java diff --git a/spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeCodecTests.java b/spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeCodecTests.java similarity index 100% rename from spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeCodecTests.java rename to spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/CompositeCodecTests.java diff --git a/spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoCodecTests.java b/spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoCodecTests.java similarity index 100% rename from spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoCodecTests.java rename to spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoCodecTests.java diff --git a/spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoFileCodecTests.java b/spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoFileCodecTests.java similarity index 100% rename from spring-cloud-streams-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoFileCodecTests.java rename to spring-cloud-stream-codec/src/test/java/org/springframework/xd/dirt/integration/bus/serializer/kryo/KryoFileCodecTests.java diff --git a/spring-cloud-streams-common/pom.xml b/spring-cloud-stream-common/pom.xml similarity index 80% rename from spring-cloud-streams-common/pom.xml rename to spring-cloud-stream-common/pom.xml index 789678193..836a728e8 100644 --- a/spring-cloud-streams-common/pom.xml +++ b/spring-cloud-stream-common/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-common + spring-cloud-stream-common jar - spring-cloud-streams-common + spring-cloud-stream-common Spring Cloud Streams common components org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-streams-common/src/main/java/org/springframework/cloud/streams/exception/CloudStreamsRuntimeException.java b/spring-cloud-stream-common/src/main/java/org/springframework/cloud/stream/exception/CloudStreamsRuntimeException.java similarity index 94% rename from spring-cloud-streams-common/src/main/java/org/springframework/cloud/streams/exception/CloudStreamsRuntimeException.java rename to spring-cloud-stream-common/src/main/java/org/springframework/cloud/stream/exception/CloudStreamsRuntimeException.java index fac3dd2be..dc33d28d5 100644 --- a/spring-cloud-streams-common/src/main/java/org/springframework/cloud/streams/exception/CloudStreamsRuntimeException.java +++ b/spring-cloud-stream-common/src/main/java/org/springframework/cloud/stream/exception/CloudStreamsRuntimeException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.exception; +package org.springframework.cloud.stream.exception; /** * @author David Turanski diff --git a/spring-cloud-streams-samples/sink/pom.xml b/spring-cloud-stream-samples/double/pom.xml similarity index 85% rename from spring-cloud-streams-samples/sink/pom.xml rename to spring-cloud-stream-samples/double/pom.xml index 51e370342..6bd008055 100644 --- a/spring-cloud-streams-samples/sink/pom.xml +++ b/spring-cloud-stream-samples/double/pom.xml @@ -3,14 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-sink + spring-cloud-stream-sample-double jar - spring-cloud-streams-sample-sink + + spring-cloud-stream-sample-double Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -23,11 +24,11 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/double/src/main/java/config/SinkModuleDefinition.java b/spring-cloud-stream-samples/double/src/main/java/config/SinkModuleDefinition.java similarity index 90% rename from spring-cloud-streams-samples/double/src/main/java/config/SinkModuleDefinition.java rename to spring-cloud-stream-samples/double/src/main/java/config/SinkModuleDefinition.java index 202432126..188c22364 100644 --- a/spring-cloud-streams-samples/double/src/main/java/config/SinkModuleDefinition.java +++ b/spring-cloud-stream-samples/double/src/main/java/config/SinkModuleDefinition.java @@ -19,8 +19,8 @@ package config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Input; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Input; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.MessageChannel; diff --git a/spring-cloud-streams-samples/double/src/main/java/config/SourceModuleDefinition.java b/spring-cloud-stream-samples/double/src/main/java/config/SourceModuleDefinition.java similarity index 92% rename from spring-cloud-streams-samples/double/src/main/java/config/SourceModuleDefinition.java rename to spring-cloud-stream-samples/double/src/main/java/config/SourceModuleDefinition.java index 90fd6cb1c..bb6a2ae09 100644 --- a/spring-cloud-streams-samples/double/src/main/java/config/SourceModuleDefinition.java +++ b/spring-cloud-stream-samples/double/src/main/java/config/SourceModuleDefinition.java @@ -20,8 +20,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Output; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Output; import org.springframework.context.annotation.Bean; import org.springframework.integration.annotation.InboundChannelAdapter; import org.springframework.integration.annotation.Poller; diff --git a/spring-cloud-streams-samples/double/src/main/java/demo/DoubleApplication.java b/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java similarity index 80% rename from spring-cloud-streams-samples/double/src/main/java/demo/DoubleApplication.java rename to spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java index 6082ce8b6..ea5993a41 100644 --- a/spring-cloud-streams-samples/double/src/main/java/demo/DoubleApplication.java +++ b/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java @@ -2,8 +2,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.aggregate.AggregateBuilder; -import org.springframework.cloud.streams.aggregate.AggregateConfigurer; +import org.springframework.cloud.stream.aggregate.AggregateBuilder; +import org.springframework.cloud.stream.aggregate.AggregateConfigurer; import config.SinkModuleDefinition; import config.SourceModuleDefinition; diff --git a/spring-cloud-streams-samples/double/src/main/resources/application.yml b/spring-cloud-stream-samples/double/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/double/src/main/resources/application.yml rename to spring-cloud-stream-samples/double/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/double/src/main/resources/sink.yml b/spring-cloud-stream-samples/double/src/main/resources/sink.yml similarity index 100% rename from spring-cloud-streams-samples/double/src/main/resources/sink.yml rename to spring-cloud-stream-samples/double/src/main/resources/sink.yml diff --git a/spring-cloud-streams-samples/double/src/main/resources/source.yml b/spring-cloud-stream-samples/double/src/main/resources/source.yml similarity index 100% rename from spring-cloud-streams-samples/double/src/main/resources/source.yml rename to spring-cloud-stream-samples/double/src/main/resources/source.yml diff --git a/spring-cloud-streams-samples/double/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/double/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/double/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/double/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams-samples/extended/pom.xml b/spring-cloud-stream-samples/extended/pom.xml similarity index 79% rename from spring-cloud-streams-samples/extended/pom.xml rename to spring-cloud-stream-samples/extended/pom.xml index 69c2f4346..5717bc6bc 100644 --- a/spring-cloud-streams-samples/extended/pom.xml +++ b/spring-cloud-stream-samples/extended/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-extended + spring-cloud-stream-sample-extended jar - spring-cloud-streams-sample-extended + spring-cloud-stream-sample-extended Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -23,23 +23,23 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-sample-source + spring-cloud-stream-sample-source org.springframework.cloud - spring-cloud-streams-sample-transform + spring-cloud-stream-sample-transform org.springframework.cloud - spring-cloud-streams-sample-sink + spring-cloud-stream-sample-sink org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/extended/src/main/java/extended/ExtendedApplication.java b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java similarity index 83% rename from spring-cloud-streams-samples/extended/src/main/java/extended/ExtendedApplication.java rename to spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java index 8b8aca2f0..35fcecc53 100644 --- a/spring-cloud-streams-samples/extended/src/main/java/extended/ExtendedApplication.java +++ b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java @@ -2,8 +2,8 @@ package extended; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.aggregate.AggregateBuilder; -import org.springframework.cloud.streams.aggregate.AggregateConfigurer; +import org.springframework.cloud.stream.aggregate.AggregateBuilder; +import org.springframework.cloud.stream.aggregate.AggregateConfigurer; import sink.LogSink; import source.TimeSource; diff --git a/spring-cloud-streams-samples/extended/src/main/resources/application.yml b/spring-cloud-stream-samples/extended/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/extended/src/main/resources/application.yml rename to spring-cloud-stream-samples/extended/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/extended/src/main/resources/source.yml b/spring-cloud-stream-samples/extended/src/main/resources/source.yml similarity index 100% rename from spring-cloud-streams-samples/extended/src/main/resources/source.yml rename to spring-cloud-stream-samples/extended/src/main/resources/source.yml diff --git a/spring-cloud-streams-samples/extended/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/extended/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/extended/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/extended/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams-samples/pom.xml b/spring-cloud-stream-samples/pom.xml similarity index 83% rename from spring-cloud-streams-samples/pom.xml rename to spring-cloud-stream-samples/pom.xml index 6808cc21e..cae1b34fe 100644 --- a/spring-cloud-streams-samples/pom.xml +++ b/spring-cloud-stream-samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - spring-cloud-streams-samples + spring-cloud-stream-samples pom http://projects.spring.io/spring-xd/ @@ -11,7 +11,7 @@ org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT @@ -26,17 +26,17 @@ org.springframework.cloud - spring-cloud-streams-sample-source + spring-cloud-stream-sample-source ${project.version} org.springframework.cloud - spring-cloud-streams-sample-sink + spring-cloud-stream-sample-sink ${project.version} org.springframework.cloud - spring-cloud-streams-sample-transform + spring-cloud-stream-sample-transform ${project.version} diff --git a/spring-cloud-streams-samples/transform/pom.xml b/spring-cloud-stream-samples/sink/pom.xml similarity index 84% rename from spring-cloud-streams-samples/transform/pom.xml rename to spring-cloud-stream-samples/sink/pom.xml index b393a54a6..b5819dfc6 100644 --- a/spring-cloud-streams-samples/transform/pom.xml +++ b/spring-cloud-stream-samples/sink/pom.xml @@ -3,15 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-transform + spring-cloud-stream-sample-sink jar - - spring-cloud-streams-sample-transform + spring-cloud-stream-sample-sink Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -24,11 +23,11 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/sink/src/main/java/demo/SinkApplication.java b/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java similarity index 100% rename from spring-cloud-streams-samples/sink/src/main/java/demo/SinkApplication.java rename to spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java diff --git a/spring-cloud-streams-samples/sink/src/main/java/sink/LogSink.java b/spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java similarity index 89% rename from spring-cloud-streams-samples/sink/src/main/java/sink/LogSink.java rename to spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java index df329d83d..d7a1c92d1 100644 --- a/spring-cloud-streams-samples/sink/src/main/java/sink/LogSink.java +++ b/spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java @@ -19,8 +19,8 @@ package sink; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Input; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Input; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.MessageChannel; diff --git a/spring-cloud-streams-samples/sink/src/main/resources/application.yml b/spring-cloud-stream-samples/sink/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/sink/src/main/resources/application.yml rename to spring-cloud-stream-samples/sink/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/sink/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/sink/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams-samples/source/pom.xml b/spring-cloud-stream-samples/source/pom.xml similarity index 85% rename from spring-cloud-streams-samples/source/pom.xml rename to spring-cloud-stream-samples/source/pom.xml index 2a6492683..68af39632 100644 --- a/spring-cloud-streams-samples/source/pom.xml +++ b/spring-cloud-stream-samples/source/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-source + spring-cloud-stream-sample-source jar - spring-cloud-streams-sample-source + spring-cloud-stream-sample-source Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -23,11 +23,11 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/source/src/main/java/demo/SourceApplication.java b/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java similarity index 100% rename from spring-cloud-streams-samples/source/src/main/java/demo/SourceApplication.java rename to spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java diff --git a/spring-cloud-streams-samples/source/src/main/java/source/TimeSource.java b/spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java similarity index 93% rename from spring-cloud-streams-samples/source/src/main/java/source/TimeSource.java rename to spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java index 6d9953d49..4047624be 100644 --- a/spring-cloud-streams-samples/source/src/main/java/source/TimeSource.java +++ b/spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java @@ -21,8 +21,8 @@ import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Output; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Output; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.annotation.InboundChannelAdapter; diff --git a/spring-cloud-streams-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java b/spring-cloud-stream-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java similarity index 100% rename from spring-cloud-streams-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java rename to spring-cloud-stream-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java diff --git a/spring-cloud-streams-samples/source/src/main/resources/application.yml b/spring-cloud-stream-samples/source/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/source/src/main/resources/application.yml rename to spring-cloud-stream-samples/source/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/source/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/source/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/source/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/source/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams-samples/tap/pom.xml b/spring-cloud-stream-samples/tap/pom.xml similarity index 84% rename from spring-cloud-streams-samples/tap/pom.xml rename to spring-cloud-stream-samples/tap/pom.xml index 8e5b49701..6477f1754 100644 --- a/spring-cloud-streams-samples/tap/pom.xml +++ b/spring-cloud-stream-samples/tap/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-tap + spring-cloud-stream-sample-tap jar - spring-cloud-streams-sample-tap + spring-cloud-stream-sample-tap Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -23,11 +23,11 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/tap/src/main/java/config/TappingLoggingSink.java b/spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java similarity index 90% rename from spring-cloud-streams-samples/tap/src/main/java/config/TappingLoggingSink.java rename to spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java index 3d986e5b7..dc1436afd 100644 --- a/spring-cloud-streams-samples/tap/src/main/java/config/TappingLoggingSink.java +++ b/spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java @@ -19,8 +19,8 @@ package config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Input; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Input; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.MessageChannel; diff --git a/spring-cloud-streams-samples/tap/src/main/java/demo/TapApplication.java b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java similarity index 88% rename from spring-cloud-streams-samples/tap/src/main/java/demo/TapApplication.java rename to spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java index 5c554ef57..d3be7c678 100644 --- a/spring-cloud-streams-samples/tap/src/main/java/demo/TapApplication.java +++ b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.EnableModule; import org.springframework.context.annotation.ComponentScan; import config.TappingLoggingSink; diff --git a/spring-cloud-streams-samples/tap/src/main/resources/application.yml b/spring-cloud-stream-samples/tap/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/tap/src/main/resources/application.yml rename to spring-cloud-stream-samples/tap/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/tap/src/main/resources/bootstrap.yml b/spring-cloud-stream-samples/tap/src/main/resources/bootstrap.yml similarity index 100% rename from spring-cloud-streams-samples/tap/src/main/resources/bootstrap.yml rename to spring-cloud-stream-samples/tap/src/main/resources/bootstrap.yml diff --git a/spring-cloud-streams-samples/tap/src/main/resources/config/logger.properties b/spring-cloud-stream-samples/tap/src/main/resources/config/logger.properties similarity index 100% rename from spring-cloud-streams-samples/tap/src/main/resources/config/logger.properties rename to spring-cloud-stream-samples/tap/src/main/resources/config/logger.properties diff --git a/spring-cloud-streams-samples/tap/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/tap/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/tap/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/tap/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams-samples/double/pom.xml b/spring-cloud-stream-samples/transform/pom.xml similarity index 84% rename from spring-cloud-streams-samples/double/pom.xml rename to spring-cloud-stream-samples/transform/pom.xml index de819bf72..af54748be 100644 --- a/spring-cloud-streams-samples/double/pom.xml +++ b/spring-cloud-stream-samples/transform/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams-sample-double + spring-cloud-stream-sample-transform jar - spring-cloud-streams-sample-double + spring-cloud-stream-sample-transform Demo project for Spring XD module org.springframework.cloud - spring-cloud-streams-samples + spring-cloud-stream-samples 1.0.0.BUILD-SNAPSHOT @@ -24,11 +24,11 @@ org.springframework.cloud - spring-cloud-streams + spring-cloud-stream org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.boot diff --git a/spring-cloud-streams-samples/transform/src/main/java/demo/TransformApplication.java b/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java similarity index 100% rename from spring-cloud-streams-samples/transform/src/main/java/demo/TransformApplication.java rename to spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java diff --git a/spring-cloud-streams-samples/transform/src/main/java/transform/LoggingTransformer.java b/spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java similarity index 96% rename from spring-cloud-streams-samples/transform/src/main/java/transform/LoggingTransformer.java rename to spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java index 2d72eb18f..70e9a0822 100644 --- a/spring-cloud-streams-samples/transform/src/main/java/transform/LoggingTransformer.java +++ b/spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.streams.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.EnableModule; import org.springframework.context.annotation.Bean; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; diff --git a/spring-cloud-streams-samples/transform/src/main/resources/application.yml b/spring-cloud-stream-samples/transform/src/main/resources/application.yml similarity index 100% rename from spring-cloud-streams-samples/transform/src/main/resources/application.yml rename to spring-cloud-stream-samples/transform/src/main/resources/application.yml diff --git a/spring-cloud-streams-samples/transform/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/transform/src/test/java/demo/ModuleApplicationTests.java similarity index 100% rename from spring-cloud-streams-samples/transform/src/test/java/demo/ModuleApplicationTests.java rename to spring-cloud-stream-samples/transform/src/test/java/demo/ModuleApplicationTests.java diff --git a/spring-cloud-streams/pom.xml b/spring-cloud-stream/pom.xml similarity index 83% rename from spring-cloud-streams/pom.xml rename to spring-cloud-stream/pom.xml index daca63488..44eb7c63f 100644 --- a/spring-cloud-streams/pom.xml +++ b/spring-cloud-stream/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-streams + spring-cloud-stream jar - spring-cloud-streams + spring-cloud-stream Messaging Microservices with Spring Integration org.springframework.cloud - spring-cloud-streams-parent + spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT @@ -40,7 +40,7 @@ org.springframework.cloud - spring-cloud-streams-codec + spring-cloud-stream-codec @@ -50,16 +50,16 @@ org.springframework.cloud - spring-cloud-streams-binding-local + spring-cloud-stream-binding-local org.springframework.cloud - spring-cloud-streams-binding-redis + spring-cloud-stream-binding-redis org.springframework.cloud - spring-cloud-streams-binding-rabbit + spring-cloud-stream-binding-rabbit true diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBinding.java similarity index 95% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBinding.java index e0332152d..3a59fb4a9 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; /** * Represents a binding between a local and remote message channel. diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBindingAdapter.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java similarity index 99% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBindingAdapter.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java index 88f6d9183..8654a2b88 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBindingAdapter.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; import java.util.ArrayList; import java.util.Collection; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; -import org.springframework.cloud.streams.config.ChannelBindingProperties; +import org.springframework.cloud.stream.config.ChannelBindingProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelLocator.java similarity index 93% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelLocator.java index 3a7de7c17..88e53fe29 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelLocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelsMetadata.java similarity index 92% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelsMetadata.java index 70ca981c4..bb1d4db77 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelsMetadata.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; import java.util.Collection; import java.util.Collections; -import org.springframework.cloud.streams.config.ChannelBindingProperties; +import org.springframework.cloud.stream.config.ChannelBindingProperties; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/DefaultChannelLocator.java similarity index 95% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/DefaultChannelLocator.java index 243e677b7..41f72e00b 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/DefaultChannelLocator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; -import org.springframework.cloud.streams.config.ChannelBindingProperties; +import org.springframework.cloud.stream.config.ChannelBindingProperties; import org.springframework.util.StringUtils; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/InputChannelBinding.java similarity index 94% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/InputChannelBinding.java index d2fc37224..74a386622 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/InputChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/OutputChannelBinding.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/OutputChannelBinding.java index 8ba652742..99f5b7a5b 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/OutputChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateBuilder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateBuilder.java similarity index 99% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateBuilder.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateBuilder.java index 5a4c6995f..15de0f3a2 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateBuilder.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.aggregate; +package org.springframework.cloud.stream.aggregate; import java.util.ArrayList; import java.util.HashSet; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateConfigurer.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateConfigurer.java similarity index 93% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateConfigurer.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateConfigurer.java index 735f57e4c..80bad24c5 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/aggregate/AggregateConfigurer.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.aggregate; +package org.springframework.cloud.stream.aggregate; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/EnableModule.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java similarity index 75% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/EnableModule.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java index 4e13c4adc..1e2552c44 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/EnableModule.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.annotation; +package org.springframework.cloud.stream.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,12 +23,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.cloud.streams.config.AggregateBuilderConfiguration; -import org.springframework.cloud.streams.config.EnableModuleConfiguration; -import org.springframework.cloud.streams.config.LifecycleConfiguration; -import org.springframework.cloud.streams.config.ChannelBindingAdapterConfiguration; -import org.springframework.cloud.streams.config.RabbitServiceConfiguration; -import org.springframework.cloud.streams.config.RedisServiceConfiguration; +import org.springframework.cloud.stream.config.AggregateBuilderConfiguration; +import org.springframework.cloud.stream.config.EnableModuleConfiguration; +import org.springframework.cloud.stream.config.LifecycleConfiguration; +import org.springframework.cloud.stream.config.ChannelBindingAdapterConfiguration; +import org.springframework.cloud.stream.config.RabbitServiceConfiguration; +import org.springframework.cloud.stream.config.RedisServiceConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.integration.annotation.MessageEndpoint; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Input.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Input.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Input.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Input.java index 85a2e2492..586cce5aa 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Input.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Input.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.annotation; +package org.springframework.cloud.stream.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Output.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Output.java similarity index 95% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Output.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Output.java index 19297b76b..a9d62e26a 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/annotation/Output.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Output.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.annotation; +package org.springframework.cloud.stream.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/AggregateBuilderConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java similarity index 88% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/AggregateBuilderConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java index 1d3717bf7..e57980854 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/AggregateBuilderConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; -import org.springframework.cloud.streams.aggregate.AggregateBuilder; -import org.springframework.cloud.streams.aggregate.AggregateConfigurer; +import org.springframework.cloud.stream.aggregate.AggregateBuilder; +import org.springframework.cloud.stream.aggregate.AggregateConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java similarity index 93% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java index 6d96386fb..9615685d8 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import java.util.ArrayList; import java.util.Arrays; @@ -35,13 +35,13 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.streams.adapter.ChannelBindingAdapter; -import org.springframework.cloud.streams.adapter.ChannelLocator; -import org.springframework.cloud.streams.adapter.InputChannelBinding; -import org.springframework.cloud.streams.adapter.OutputChannelBinding; -import org.springframework.cloud.streams.annotation.Input; -import org.springframework.cloud.streams.annotation.Output; -import org.springframework.cloud.streams.endpoint.ChannelsEndpoint; +import org.springframework.cloud.stream.adapter.ChannelBindingAdapter; +import org.springframework.cloud.stream.adapter.ChannelLocator; +import org.springframework.cloud.stream.adapter.InputChannelBinding; +import org.springframework.cloud.stream.adapter.OutputChannelBinding; +import org.springframework.cloud.stream.annotation.Input; +import org.springframework.cloud.stream.annotation.Output; +import org.springframework.cloud.stream.endpoint.ChannelsEndpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingProperties.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingProperties.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java index a2508ac2f..c53321c80 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingProperties.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import java.util.Properties; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingPropertiesAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingPropertiesAutoConfiguration.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingPropertiesAutoConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingPropertiesAutoConfiguration.java index 65f790270..46ee4ae57 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingPropertiesAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingPropertiesAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.SearchStrategy; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/DirectChannelFactoryBean.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/DirectChannelFactoryBean.java similarity index 88% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/DirectChannelFactoryBean.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/DirectChannelFactoryBean.java index bc42f440d..1521c6b6f 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/DirectChannelFactoryBean.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/DirectChannelFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.integration.channel.DirectChannel; @@ -22,8 +22,8 @@ import org.springframework.messaging.MessageChannel; /** * {@link FactoryBean} for creating channels for fields annotated with - * {@link org.springframework.cloud.streams.annotation.Input} and - * {@link org.springframework.cloud.streams.annotation.Output}. + * {@link org.springframework.cloud.stream.annotation.Input} and + * {@link org.springframework.cloud.stream.annotation.Output}. * * @author Marius Bogoevici */ diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/EnableModuleConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java similarity index 94% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/EnableModuleConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java index c6e3cbf12..37df97e5c 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/EnableModuleConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java similarity index 90% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java index ab5ba9cd5..72dea6ffa 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; -import org.springframework.cloud.streams.adapter.ChannelBindingAdapter; +import org.springframework.cloud.stream.adapter.ChannelBindingAdapter; import org.springframework.context.annotation.Configuration; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ModulePostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModulePostProcessor.java similarity index 92% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ModulePostProcessor.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModulePostProcessor.java index 8a9a00751..dabbbe83e 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ModulePostProcessor.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModulePostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import java.lang.reflect.Field; @@ -24,10 +24,10 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; -import org.springframework.cloud.streams.annotation.EnableModule; -import org.springframework.cloud.streams.annotation.Input; -import org.springframework.cloud.streams.annotation.Output; -import org.springframework.cloud.streams.utils.BeanDefinitionRegistryUtils; +import org.springframework.cloud.stream.annotation.EnableModule; +import org.springframework.cloud.stream.annotation.Input; +import org.springframework.cloud.stream.annotation.Output; +import org.springframework.cloud.stream.utils.BeanDefinitionRegistryUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.annotation.AnnotationUtils; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RabbitServiceConfiguration.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RabbitServiceConfiguration.java index 926e89cff..45633e324 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RabbitServiceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RedisServiceConfiguration.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RedisServiceConfiguration.java index 26ce4d2b6..66e08ca74 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/RedisServiceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/endpoint/ChannelsEndpoint.java similarity index 90% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/endpoint/ChannelsEndpoint.java index 14e9f1307..8d1c98a46 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/endpoint/ChannelsEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.endpoint; +package org.springframework.cloud.stream.endpoint; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; -import org.springframework.cloud.streams.adapter.ChannelsMetadata; -import org.springframework.cloud.streams.adapter.ChannelBindingAdapter; -import org.springframework.cloud.streams.adapter.OutputChannelBinding; +import org.springframework.cloud.stream.adapter.ChannelsMetadata; +import org.springframework.cloud.stream.adapter.ChannelBindingAdapter; +import org.springframework.cloud.stream.adapter.OutputChannelBinding; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/utils/BeanDefinitionRegistryUtils.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/utils/BeanDefinitionRegistryUtils.java similarity index 87% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/utils/BeanDefinitionRegistryUtils.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/utils/BeanDefinitionRegistryUtils.java index c5d41dc0b..13d23f9cd 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/utils/BeanDefinitionRegistryUtils.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/utils/BeanDefinitionRegistryUtils.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.cloud.streams.utils; +package org.springframework.cloud.stream.utils; import java.lang.annotation.Annotation; import org.springframework.beans.factory.support.AutowireCandidateQualifier; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.cloud.streams.annotation.Input; -import org.springframework.cloud.streams.annotation.Output; -import org.springframework.cloud.streams.config.DirectChannelFactoryBean; +import org.springframework.cloud.stream.annotation.Input; +import org.springframework.cloud.stream.annotation.Output; +import org.springframework.cloud.stream.config.DirectChannelFactoryBean; /** * Utility class for registering bean definitions. diff --git a/spring-cloud-streams/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolver.java b/spring-cloud-stream/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolver.java similarity index 100% rename from spring-cloud-streams/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolver.java rename to spring-cloud-stream/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolver.java diff --git a/spring-cloud-streams/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareRouterBeanPostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareRouterBeanPostProcessor.java similarity index 100% rename from spring-cloud-streams/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareRouterBeanPostProcessor.java rename to spring-cloud-stream/src/main/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareRouterBeanPostProcessor.java diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/rabbit-bus.properties b/spring-cloud-stream/src/main/resources/META-INF/spring-cloud-streams/rabbit-bus.properties similarity index 100% rename from spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/rabbit-bus.properties rename to spring-cloud-stream/src/main/resources/META-INF/spring-cloud-streams/rabbit-bus.properties diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/redis-bus.properties b/spring-cloud-stream/src/main/resources/META-INF/spring-cloud-streams/redis-bus.properties similarity index 100% rename from spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/redis-bus.properties rename to spring-cloud-stream/src/main/resources/META-INF/spring-cloud-streams/redis-bus.properties diff --git a/spring-cloud-stream/src/main/resources/META-INF/spring.factories b/spring-cloud-stream/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..0c865288b --- /dev/null +++ b/spring-cloud-stream/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ +org.springframework.cloud.stream.config.ChannelBindingPropertiesAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/adapter/DefaultChannelLocatorTests.java similarity index 92% rename from spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/adapter/DefaultChannelLocatorTests.java index 90c1a50e4..c64e9992c 100644 --- a/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/adapter/DefaultChannelLocatorTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.streams.adapter; +package org.springframework.cloud.stream.adapter; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.cloud.streams.adapter.DefaultChannelLocator; -import org.springframework.cloud.streams.config.ChannelBindingProperties; +import org.springframework.cloud.stream.adapter.DefaultChannelLocator; +import org.springframework.cloud.stream.config.ChannelBindingProperties; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfigurationTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java similarity index 92% rename from spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfigurationTests.java rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java index 36f1fb077..ce8a279b1 100644 --- a/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfigurationTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.streams.config; +package org.springframework.cloud.stream.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -29,11 +29,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.cloud.streams.adapter.ChannelBinding; -import org.springframework.cloud.streams.adapter.ChannelBindingAdapter; -import org.springframework.cloud.streams.adapter.OutputChannelBinding; -import org.springframework.cloud.streams.config.ChannelBindingAdapterConfigurationTests.Empty; -import org.springframework.cloud.streams.utils.BeanDefinitionRegistryUtils; +import org.springframework.cloud.stream.adapter.ChannelBinding; +import org.springframework.cloud.stream.adapter.ChannelBindingAdapter; +import org.springframework.cloud.stream.adapter.OutputChannelBinding; +import org.springframework.cloud.stream.config.ChannelBindingAdapterConfigurationTests.Empty; +import org.springframework.cloud.stream.utils.BeanDefinitionRegistryUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-streams/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolverTests.java b/spring-cloud-stream/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolverTests.java similarity index 100% rename from spring-cloud-streams/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolverTests.java rename to spring-cloud-stream/src/test/java/org/springframework/xd/dirt/integration/bus/MessageBusAwareChannelResolverTests.java diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring.factories b/spring-cloud-streams/src/main/resources/META-INF/spring.factories deleted file mode 100644 index cbae45173..000000000 --- a/spring-cloud-streams/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ -org.springframework.cloud.streams.config.ChannelBindingPropertiesAutoConfiguration \ No newline at end of file