From f858c52103e4ba8a96b760881f5c896bad4e63c5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 9 Jul 2015 09:02:32 +0100 Subject: [PATCH] More Bus->Streams name updates --- .../{EnableMessageBus.java => EnableChannelBinding.java} | 2 +- .../streams/config/ChannelBindingAdapterConfiguration.java | 2 +- .../cloud/streams/config/RabbitServiceConfiguration.java | 6 +++--- .../cloud/streams/config/RedisServiceConfiguration.java | 6 +++--- .../META-INF/{spring-bus => spring-cloud-streams}/codec.xml | 0 .../rabbit-bus.properties | 0 .../redis-bus.properties | 0 .../sink/src/main/java/demo/SinkApplication.java | 4 ++-- .../source-xml/src/main/java/demo/ModuleApplication.java | 4 ++-- .../source/src/main/java/demo/SourceApplication.java | 4 ++-- .../tap/src/main/java/demo/TapApplication.java | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) rename spring-cloud-streams/src/main/java/org/springframework/cloud/streams/{EnableMessageBus.java => EnableChannelBinding.java} (97%) rename spring-cloud-streams/src/main/resources/META-INF/{spring-bus => spring-cloud-streams}/codec.xml (100%) rename spring-cloud-streams/src/main/resources/META-INF/{spring-bus => spring-cloud-streams}/rabbit-bus.properties (100%) rename spring-cloud-streams/src/main/resources/META-INF/{spring-bus => spring-cloud-streams}/redis-bus.properties (100%) diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableChannelBinding.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableChannelBinding.java index 47ec0d788..7c88e27bf 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableChannelBinding.java @@ -41,6 +41,6 @@ import org.springframework.context.annotation.Import; @Configuration @Import({ RedisServiceConfiguration.class, RabbitServiceConfiguration.class, ChannelBindingAdapterConfiguration.class, LifecycleConfiguration.class }) -public @interface EnableMessageBus { +public @interface EnableChannelBinding { } diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java index 1209cb7b8..cb2ff2c7f 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/ChannelBindingAdapterConfiguration.java @@ -49,7 +49,7 @@ import org.springframework.xd.dirt.integration.bus.MessageBusAwareRouterBeanPost * */ @Configuration -@ImportResource("classpath*:/META-INF/spring-bus/codec.xml") +@ImportResource("classpath*:/META-INF/spring-cloud-streams/codec.xml") public class ChannelBindingAdapterConfiguration { @Autowired diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java index b0903f021..abf577b29 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java @@ -36,15 +36,15 @@ import org.springframework.xd.dirt.integration.rabbit.RabbitMessageBus; @Configuration @ConditionalOnClass(RabbitMessageBus.class) @ImportResource({ "classpath*:/META-INF/spring-xd/bus/rabbit-bus.xml", - "classpath*:/META-INF/spring-xd/analytics/rabbit-analytics.xml" }) -@PropertySource("classpath:/META-INF/spring-bus/rabbit-bus.properties") +"classpath*:/META-INF/spring-xd/analytics/rabbit-analytics.xml" }) +@PropertySource("classpath:/META-INF/spring-cloud-streams/rabbit-bus.properties") public class RabbitServiceConfiguration { @Configuration @Profile("cloud") protected static class CloudConfig { @Bean public Cloud cloud() { - return new CloudFactory().getCloud(); + return new CloudFactory().getCloud(); } @Bean ConnectionFactory redisConnectionFactory(Cloud cloud) { diff --git a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java index 72ad24b47..3d94ab9db 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java @@ -36,8 +36,8 @@ import org.springframework.xd.dirt.integration.redis.RedisMessageBus; @Configuration @ConditionalOnClass(RedisMessageBus.class) @ImportResource({ "classpath*:/META-INF/spring-xd/bus/redis-bus.xml", - "classpath*:/META-INF/spring-xd/analytics/redis-analytics.xml" }) -@PropertySource("classpath:/META-INF/spring-bus/redis-bus.properties") +"classpath*:/META-INF/spring-xd/analytics/redis-analytics.xml" }) +@PropertySource("classpath:/META-INF/spring-cloud-streams/redis-bus.properties") public class RedisServiceConfiguration { @Configuration @@ -45,7 +45,7 @@ public class RedisServiceConfiguration { protected static class CloudConfig { @Bean public Cloud cloud() { - return new CloudFactory().getCloud(); + return new CloudFactory().getCloud(); } @Bean RedisConnectionFactory redisConnectionFactory(Cloud cloud) { diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring-bus/codec.xml b/spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/codec.xml similarity index 100% rename from spring-cloud-streams/src/main/resources/META-INF/spring-bus/codec.xml rename to spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/codec.xml diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring-bus/rabbit-bus.properties b/spring-cloud-streams/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-bus/rabbit-bus.properties rename to spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/rabbit-bus.properties diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring-bus/redis-bus.properties b/spring-cloud-streams/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-bus/redis-bus.properties rename to spring-cloud-streams/src/main/resources/META-INF/spring-cloud-streams/redis-bus.properties diff --git a/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java b/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java index 400e67299..af7b4e64f 100644 --- a/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java +++ b/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java @@ -2,13 +2,13 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.EnableMessageBus; +import org.springframework.cloud.streams.EnableChannelBinding; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition; @SpringBootApplication -@EnableMessageBus +@EnableChannelBinding @ComponentScan(basePackageClasses=ModuleDefinition.class) public class SinkApplication { diff --git a/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java b/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java index 61cbb5cf5..a646830eb 100644 --- a/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java +++ b/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java @@ -2,12 +2,12 @@ package demo; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.cloud.streams.EnableMessageBus; +import org.springframework.cloud.streams.EnableChannelBinding; import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.PropertySource; @SpringBootApplication -@EnableMessageBus +@EnableChannelBinding @ImportResource("classpath:/config/ticker.xml") @PropertySource("classpath:/config/ticker.properties") public class ModuleApplication { diff --git a/spring-xd-samples/source/src/main/java/demo/SourceApplication.java b/spring-xd-samples/source/src/main/java/demo/SourceApplication.java index 5b74ec926..55059897f 100644 --- a/spring-xd-samples/source/src/main/java/demo/SourceApplication.java +++ b/spring-xd-samples/source/src/main/java/demo/SourceApplication.java @@ -2,13 +2,13 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.EnableMessageBus; +import org.springframework.cloud.streams.EnableChannelBinding; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition; @SpringBootApplication -@EnableMessageBus +@EnableChannelBinding @ComponentScan(basePackageClasses=ModuleDefinition.class) public class SourceApplication { diff --git a/spring-xd-samples/tap/src/main/java/demo/TapApplication.java b/spring-xd-samples/tap/src/main/java/demo/TapApplication.java index 08843af09..f2b5ba0d0 100644 --- a/spring-xd-samples/tap/src/main/java/demo/TapApplication.java +++ b/spring-xd-samples/tap/src/main/java/demo/TapApplication.java @@ -2,13 +2,13 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.streams.EnableMessageBus; +import org.springframework.cloud.streams.EnableChannelBinding; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition; @SpringBootApplication -@EnableMessageBus +@EnableChannelBinding @ComponentScan(basePackageClasses=ModuleDefinition.class) public class TapApplication {