From 997356cbe5d3c0f995b9fdd93440c809dae7d576 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 8 Jul 2015 17:02:44 +0100 Subject: [PATCH] Switch to spring-cloud-streams naming --- pom.xml | 16 ++++++++-------- .../pom.xml | 12 ++++++------ .../bus/runner/EnableMessageBus.java | 0 .../bus/runner/adapter/ChannelBinding.java | 0 .../bus/runner/adapter/ChannelLocator.java | 0 .../bus/runner/adapter/ChannelsMetadata.java | 0 .../runner/adapter/DefaultChannelLocator.java | 0 .../bus/runner/adapter/Input.java | 0 .../bus/runner/adapter/InputChannelBinding.java | 0 .../bus/runner/adapter/MessageBusAdapter.java | 0 .../bus/runner/adapter/Output.java | 0 .../bus/runner/adapter/OutputChannelBinding.java | 0 .../DiscoveryClientAutoConfiguration.java | 0 .../discovery/DiscoveryClientChannelLocator.java | 0 .../runner/config/LifecycleConfiguration.java | 0 .../config/MessageBusAdapterConfiguration.java | 0 .../bus/runner/config/MessageBusProperties.java | 0 .../config/RabbitServiceConfiguration.java | 0 .../runner/config/RedisServiceConfiguration.java | 0 .../bus/runner/endpoint/ChannelsEndpoint.java | 0 .../META-INF/spring-bus/rabbit-bus.properties | 0 .../META-INF/spring-bus/redis-bus.properties | 0 .../src/main/resources/META-INF/spring.factories | 0 .../adapter/DefaultChannelLocatorTests.java | 0 .../DiscoveryClientChannelLocatorTests.java | 0 .../MessageBusAdapterConfigurationTests.java | 0 spring-xd-runner/pom.xml | 12 ++++++------ spring-xd-samples/pom.xml | 6 +++--- spring-xd-samples/sink/pom.xml | 6 +++--- spring-xd-samples/source-xml/pom.xml | 6 +++--- spring-xd-samples/source/pom.xml | 6 +++--- spring-xd-samples/tap/pom.xml | 4 ++-- 32 files changed, 34 insertions(+), 34 deletions(-) rename {spring-bus-core => spring-cloud-streams}/pom.xml (85%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/EnableMessageBus.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/Input.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/Output.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/resources/META-INF/spring-bus/rabbit-bus.properties (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/resources/META-INF/spring-bus/redis-bus.properties (100%) rename {spring-bus-core => spring-cloud-streams}/src/main/resources/META-INF/spring.factories (100%) rename {spring-bus-core => spring-cloud-streams}/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java (100%) rename {spring-bus-core => spring-cloud-streams}/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java (100%) diff --git a/pom.xml b/pom.xml index 40b3907b7..179e32e14 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.springframework.bus - spring-bus-parent + org.springframework.cloud + spring-cloud-streams-parent 1.0.0.BUILD-SNAPSHOT pom http://projects.spring.io/spring-xd/ @@ -12,12 +12,12 @@ 1.7 - 1.3.0.M1 - 1.0.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT + Brixton.BUILD-SNAPSHOT 2.0.0.BUILD-SNAPSHOT - spring-bus-core + spring-cloud-streams spring-xd-runner spring-xd-samples @@ -38,12 +38,12 @@ import - org.springframework.bus - spring-bus-core + org.springframework.cloud + spring-cloud-streams 1.0.0.BUILD-SNAPSHOT - org.springframework.bus + org.springframework.cloud spring-xd-runner 1.0.0.BUILD-SNAPSHOT diff --git a/spring-bus-core/pom.xml b/spring-cloud-streams/pom.xml similarity index 85% rename from spring-bus-core/pom.xml rename to spring-cloud-streams/pom.xml index 1a8577932..029910288 100644 --- a/spring-bus-core/pom.xml +++ b/spring-cloud-streams/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bus - spring-bus-core + org.springframework.cloud + spring-cloud-streams 1.0.0.BUILD-SNAPSHOT jar - spring-bus-runner - Demo project for Spring Integration as apps + spring-cloud-streams + Messaging Microservices with Spring Integration - org.springframework.bus - spring-bus-parent + org.springframework.cloud + spring-cloud-streams-parent 1.0.0.BUILD-SNAPSHOT diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/EnableMessageBus.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/EnableMessageBus.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/EnableMessageBus.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/EnableMessageBus.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/Input.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Input.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/Input.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Input.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/Output.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Output.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/Output.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Output.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java b/spring-cloud-streams/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java similarity index 100% rename from spring-bus-core/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java rename to spring-cloud-streams/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java diff --git a/spring-bus-core/src/main/resources/META-INF/spring-bus/rabbit-bus.properties b/spring-cloud-streams/src/main/resources/META-INF/spring-bus/rabbit-bus.properties similarity index 100% rename from spring-bus-core/src/main/resources/META-INF/spring-bus/rabbit-bus.properties rename to spring-cloud-streams/src/main/resources/META-INF/spring-bus/rabbit-bus.properties diff --git a/spring-bus-core/src/main/resources/META-INF/spring-bus/redis-bus.properties b/spring-cloud-streams/src/main/resources/META-INF/spring-bus/redis-bus.properties similarity index 100% rename from spring-bus-core/src/main/resources/META-INF/spring-bus/redis-bus.properties rename to spring-cloud-streams/src/main/resources/META-INF/spring-bus/redis-bus.properties diff --git a/spring-bus-core/src/main/resources/META-INF/spring.factories b/spring-cloud-streams/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-bus-core/src/main/resources/META-INF/spring.factories rename to spring-cloud-streams/src/main/resources/META-INF/spring.factories diff --git a/spring-bus-core/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java b/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java similarity index 100% rename from spring-bus-core/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java rename to spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java diff --git a/spring-bus-core/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java b/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java similarity index 100% rename from spring-bus-core/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java rename to spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java diff --git a/spring-bus-core/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java b/spring-cloud-streams/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java similarity index 100% rename from spring-bus-core/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java rename to spring-cloud-streams/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java diff --git a/spring-xd-runner/pom.xml b/spring-xd-runner/pom.xml index cc26c6953..0a506f930 100644 --- a/spring-xd-runner/pom.xml +++ b/spring-xd-runner/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bus + org.springframework.cloud spring-xd-runner 1.0.0.BUILD-SNAPSHOT jar - spring-xd-module-runner + spring-xd-runner Demo project for Spring XD Modules as apps - org.springframework.bus - spring-bus-parent + org.springframework.cloud + spring-cloud-streams-parent 1.0.0.BUILD-SNAPSHOT @@ -28,8 +28,8 @@ spring-cloud-context - org.springframework.bus - spring-bus-core + org.springframework.cloud + spring-cloud-streams org.springframework.xd diff --git a/spring-xd-samples/pom.xml b/spring-xd-samples/pom.xml index d6cec4fa3..8b4d00fef 100644 --- a/spring-xd-samples/pom.xml +++ b/spring-xd-samples/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.springframework.bus + org.springframework.cloud spring-xd-samples 1.0.0.BUILD-SNAPSHOT pom @@ -11,8 +11,8 @@ http://www.spring.io - org.springframework.bus - spring-bus-parent + org.springframework.cloud + spring-cloud-streams-parent 1.0.0.BUILD-SNAPSHOT diff --git a/spring-xd-samples/sink/pom.xml b/spring-xd-samples/sink/pom.xml index c64a3fcc4..50a265857 100644 --- a/spring-xd-samples/sink/pom.xml +++ b/spring-xd-samples/sink/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 - org.springframework.bus + org.springframework.cloud spring-xd-module-runner-sample-sink 1.0.0.BUILD-SNAPSHOT jar @@ -12,7 +12,7 @@ Demo project for Spring XD module - org.springframework.bus + org.springframework.cloud spring-xd-samples 1.0.0.BUILD-SNAPSHOT @@ -25,7 +25,7 @@ - org.springframework.bus + org.springframework.cloud spring-xd-runner diff --git a/spring-xd-samples/source-xml/pom.xml b/spring-xd-samples/source-xml/pom.xml index fceb67929..a4fcadc42 100644 --- a/spring-xd-samples/source-xml/pom.xml +++ b/spring-xd-samples/source-xml/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 - org.springframework.bus + org.springframework.cloud spring-xd-module-runner-sample-source-xml 1.0.0.BUILD-SNAPSHOT jar @@ -12,7 +12,7 @@ Demo project for Spring XD module - org.springframework.bus + org.springframework.cloud spring-xd-samples 1.0.0.BUILD-SNAPSHOT @@ -25,7 +25,7 @@ - org.springframework.bus + org.springframework.cloud spring-xd-runner diff --git a/spring-xd-samples/source/pom.xml b/spring-xd-samples/source/pom.xml index 4c476550e..32b1aca41 100644 --- a/spring-xd-samples/source/pom.xml +++ b/spring-xd-samples/source/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 - org.springframework.bus + org.springframework.cloud spring-xd-module-runner-sample-source 1.0.0.BUILD-SNAPSHOT jar @@ -12,7 +12,7 @@ Demo project for Spring XD module - org.springframework.bus + org.springframework.cloud spring-xd-samples 1.0.0.BUILD-SNAPSHOT @@ -25,7 +25,7 @@ - org.springframework.bus + org.springframework.cloud spring-xd-runner diff --git a/spring-xd-samples/tap/pom.xml b/spring-xd-samples/tap/pom.xml index d93aa5909..8fe8dcffe 100644 --- a/spring-xd-samples/tap/pom.xml +++ b/spring-xd-samples/tap/pom.xml @@ -12,7 +12,7 @@ Demo project for Spring XD module - org.springframework.bus + org.springframework.cloud spring-xd-samples 1.0.0.BUILD-SNAPSHOT @@ -25,7 +25,7 @@ - org.springframework.bus + org.springframework.cloud spring-xd-runner