Change package names

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner;
+package org.springframework.cloud.streams;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,10 +23,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.bus.runner.config.LifecycleConfiguration;
-import org.springframework.bus.runner.config.MessageBusAdapterConfiguration;
-import org.springframework.bus.runner.config.RabbitServiceConfiguration;
-import org.springframework.bus.runner.config.RedisServiceConfiguration;
+import org.springframework.cloud.streams.config.LifecycleConfiguration;
+import org.springframework.cloud.streams.config.MessageBusAdapterConfiguration;
+import org.springframework.cloud.streams.config.RabbitServiceConfiguration;
+import org.springframework.cloud.streams.config.RedisServiceConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 /**
  * Represents a binding between a local and remote message channel.

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 /**
  * @author Dave Syer

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import org.springframework.bus.runner.config.MessageBusProperties;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 
 /**
  * @author Dave Syer

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
-import org.springframework.bus.runner.config.MessageBusProperties;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 import org.springframework.util.StringUtils;
 
 /**

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Input.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 /**
  * @author Dave Syer

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/MessageBusAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.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.bus.runner.config.MessageBusProperties;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Output.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 
 /**

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientAutoConfiguration.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter.discovery;
+package org.springframework.cloud.streams.adapter.discovery;
 
 import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.bus.runner.adapter.ChannelLocator;
-import org.springframework.bus.runner.adapter.Output;
-import org.springframework.bus.runner.adapter.MessageBusAdapter;
-import org.springframework.bus.runner.adapter.Input;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
 import org.springframework.cloud.client.discovery.event.HeartbeatMonitor;
+import org.springframework.cloud.streams.adapter.ChannelLocator;
+import org.springframework.cloud.streams.adapter.Input;
+import org.springframework.cloud.streams.adapter.MessageBusAdapter;
+import org.springframework.cloud.streams.adapter.Output;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
 

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientChannelLocator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter.discovery;
+package org.springframework.cloud.streams.adapter.discovery;
 
 import java.net.URI;
 import java.util.Collection;
@@ -24,11 +24,11 @@ import java.util.Random;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.bus.runner.adapter.ChannelBinding;
-import org.springframework.bus.runner.adapter.ChannelLocator;
-import org.springframework.bus.runner.adapter.ChannelsMetadata;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.streams.adapter.ChannelBinding;
+import org.springframework.cloud.streams.adapter.ChannelLocator;
+import org.springframework.cloud.streams.adapter.ChannelsMetadata;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
-import org.springframework.bus.runner.adapter.MessageBusAdapter;
+import org.springframework.cloud.streams.adapter.MessageBusAdapter;
 import org.springframework.context.annotation.Configuration;
 
 /**

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusAdapterConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,13 +29,13 @@ import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.bus.runner.adapter.ChannelLocator;
-import org.springframework.bus.runner.adapter.Input;
-import org.springframework.bus.runner.adapter.InputChannelBinding;
-import org.springframework.bus.runner.adapter.MessageBusAdapter;
-import org.springframework.bus.runner.adapter.Output;
-import org.springframework.bus.runner.adapter.OutputChannelBinding;
-import org.springframework.bus.runner.endpoint.ChannelsEndpoint;
+import org.springframework.cloud.streams.adapter.ChannelLocator;
+import org.springframework.cloud.streams.adapter.Input;
+import org.springframework.cloud.streams.adapter.InputChannelBinding;
+import org.springframework.cloud.streams.adapter.MessageBusAdapter;
+import org.springframework.cloud.streams.adapter.Output;
+import org.springframework.cloud.streams.adapter.OutputChannelBinding;
+import org.springframework.cloud.streams.endpoint.ChannelsEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import java.util.Properties;
 

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.cloud.Cloud;

spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.endpoint;
+package org.springframework.cloud.streams.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.bus.runner.adapter.ChannelsMetadata;
-import org.springframework.bus.runner.adapter.MessageBusAdapter;
-import org.springframework.bus.runner.adapter.OutputChannelBinding;
+import org.springframework.cloud.streams.adapter.ChannelsMetadata;
+import org.springframework.cloud.streams.adapter.MessageBusAdapter;
+import org.springframework.cloud.streams.adapter.OutputChannelBinding;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;

spring-cloud-streams/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,3 @@
 # AutoConfiguration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.bus.runner.adapter.discovery.DiscoveryClientAutoConfiguration
+org.springframework.cloud.streams.adapter.discovery.DiscoveryClientAutoConfiguration

spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.bus.runner.config.MessageBusProperties;
+import org.springframework.cloud.streams.adapter.DefaultChannelLocator;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 
 /**
  * @author Dave Syer

spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DiscoveryClientChannelLocatorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.adapter;
+package org.springframework.cloud.streams.adapter;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -26,10 +26,13 @@ import java.util.HashSet;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.bus.runner.adapter.discovery.DiscoveryClientChannelLocator;
-import org.springframework.bus.runner.config.MessageBusProperties;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.streams.adapter.ChannelsMetadata;
+import org.springframework.cloud.streams.adapter.InputChannelBinding;
+import org.springframework.cloud.streams.adapter.OutputChannelBinding;
+import org.springframework.cloud.streams.adapter.discovery.DiscoveryClientChannelLocator;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 import org.springframework.web.client.RestOperations;
 
 /**

spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/MessageBusAdapterConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.runner.config;
+package org.springframework.cloud.streams.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -29,10 +29,12 @@ 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.bus.runner.adapter.ChannelBinding;
-import org.springframework.bus.runner.adapter.MessageBusAdapter;
-import org.springframework.bus.runner.adapter.OutputChannelBinding;
-import org.springframework.bus.runner.config.MessageBusAdapterConfigurationTests.Empty;
+import org.springframework.cloud.streams.adapter.ChannelBinding;
+import org.springframework.cloud.streams.adapter.MessageBusAdapter;
+import org.springframework.cloud.streams.adapter.OutputChannelBinding;
+import org.springframework.cloud.streams.config.MessageBusAdapterConfiguration;
+import org.springframework.cloud.streams.config.MessageBusProperties;
+import org.springframework.cloud.streams.config.MessageBusAdapterConfigurationTests.Empty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-xd-runner/src/main/java/org/springframework/cloud/streams/xd/ModuleOptionsPropertySourceInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bus.xd.bootstrap;
+package org.springframework.cloud.streams.xd;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -24,7 +24,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.bus.runner.config.MessageBusProperties;
+import org.springframework.cloud.streams.config.MessageBusProperties;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-xd-runner/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration:\
-org.springframework.bus.xd.bootstrap.ModuleOptionsPropertySourceInitializer
+org.springframework.cloud.streams.xd.ModuleOptionsPropertySourceInitializer

spring-xd-samples/sink/src/main/java/demo/SinkApplication.java

@@ -2,7 +2,7 @@ package demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.bus.runner.EnableMessageBus;
+import org.springframework.cloud.streams.EnableMessageBus;
 import org.springframework.context.annotation.ComponentScan;
 
 import config.ModuleDefinition;

spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java

@@ -2,7 +2,7 @@ package demo;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.bus.runner.EnableMessageBus;
+import org.springframework.cloud.streams.EnableMessageBus;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.annotation.PropertySource;
 

spring-xd-samples/source/src/main/java/demo/SourceApplication.java

@@ -2,7 +2,7 @@ package demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.bus.runner.EnableMessageBus;
+import org.springframework.cloud.streams.EnableMessageBus;
 import org.springframework.context.annotation.ComponentScan;
 
 import config.ModuleDefinition;

spring-xd-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.bus.runner.EnableMessageBus;
+import org.springframework.cloud.streams.EnableMessageBus;
 import org.springframework.context.annotation.ComponentScan;
 
 import config.ModuleDefinition;