More Bus->Streams name updates

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 {
 
 }

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

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) {

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) {