Change streams->stream

docs/pom.xml

@@ -4,15 +4,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-parent</artifactId>
+		<artifactId>spring-cloud-stream-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cloud-streams-docs</artifactId>
+	<artifactId>spring-cloud-stream-docs</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Streams Docs</name>
 	<description>Spring Cloud Docs</description>
 	<properties>
-		<docs.main>spring-cloud-streams</docs.main>
+		<docs.main>spring-cloud-stream</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
  	<build>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-streams-parent</artifactId>
+	<artifactId>spring-cloud-stream-parent</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
@@ -12,9 +12,9 @@
 		<relativePath />
 	</parent>
 	<scm>
-		<url>https://github.com/spring-cloud/spring-cloud-streams</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-streams.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-streams.git</developerConnection>
+		<url>https://github.com/spring-cloud/spring-cloud-stream</url>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-stream.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-stream.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<properties>
@@ -26,11 +26,11 @@
 		<spring-integration.version>4.2.0.M2</spring-integration.version>
 	</properties>
 	<modules>
-		<module>spring-cloud-streams</module>
-		<module>spring-cloud-streams-bindings</module>
-		<module>spring-cloud-streams-codec</module>
-		<module>spring-cloud-streams-common</module>
-		<module>spring-cloud-streams-samples</module>
+		<module>spring-cloud-stream</module>
+		<module>spring-cloud-stream-bindings</module>
+		<module>spring-cloud-stream-codec</module>
+		<module>spring-cloud-stream-common</module>
+		<module>spring-cloud-stream-samples</module>
 		<module>docs</module>
 	</modules>
 	<dependencyManagement>
@@ -51,7 +51,7 @@
 			</dependency>
 		    <dependency>
 			  <groupId>org.springframework.cloud</groupId>
-			  <artifactId>spring-cloud-streams</artifactId>
+			  <artifactId>spring-cloud-stream</artifactId>
 			  <version>${project.version}</version>
 		    </dependency>
 		    <dependency>
@@ -61,12 +61,12 @@
 		    </dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-codec</artifactId>
+				<artifactId>spring-cloud-stream-codec</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-common</artifactId>
+				<artifactId>spring-cloud-stream-common</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
@@ -76,17 +76,17 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-binding-local</artifactId>
+				<artifactId>spring-cloud-stream-binding-local</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-binding-redis</artifactId>
+				<artifactId>spring-cloud-stream-binding-redis</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-binding-rabbit</artifactId>
+				<artifactId>spring-cloud-stream-binding-rabbit</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>

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">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<artifactId>spring-cloud-streams-bindings-parent</artifactId>
+	<artifactId>spring-cloud-stream-bindings-parent</artifactId>
 	<packaging>pom</packaging>
 	<url>http://projects.spring.io/spring-xd/</url>
 	<organization>
@@ -12,7 +12,7 @@
 	</organization>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-parent</artifactId>
+		<artifactId>spring-cloud-stream-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<properties>
@@ -20,24 +20,24 @@
 		<curator.version>2.6.0</curator.version>
 	</properties>
 	<modules>
-		<module>spring-cloud-streams-binding-spi</module>
-		<module>spring-cloud-streams-binding-test</module>
-		<module>spring-cloud-streams-binding-local</module>
-		<module>spring-cloud-streams-binding-rabbit</module>
-		<module>spring-cloud-streams-binding-redis</module>
-		<module>spring-cloud-streams-binding-kafka</module>
+		<module>spring-cloud-stream-binding-spi</module>
+		<module>spring-cloud-stream-binding-test</module>
+		<module>spring-cloud-stream-binding-local</module>
+		<module>spring-cloud-stream-binding-rabbit</module>
+		<module>spring-cloud-stream-binding-redis</module>
+		<module>spring-cloud-stream-binding-kafka</module>
 	</modules>
 	
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-binding-spi</artifactId>
+				<artifactId>spring-cloud-stream-binding-spi</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-streams-binding-test</artifactId>
+				<artifactId>spring-cloud-stream-binding-test</artifactId>
 				<version>${project.version}</version>
 				<scope>test</scope>
 			</dependency>

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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-streams-binding-kafka</artifactId>
+	<artifactId>spring-cloud-stream-binding-kafka</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-binding-kafka</name>
+	<name>spring-cloud-stream-binding-kafka</name>
 	<description>Kafka binding implementation</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-bindings-parent</artifactId>
+		<artifactId>spring-cloud-stream-bindings-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -24,11 +24,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-spi</artifactId>
+			<artifactId>spring-cloud-stream-binding-spi</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-test</artifactId>
+			<artifactId>spring-cloud-stream-binding-test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>

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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-streams-binding-local</artifactId>
+	<artifactId>spring-cloud-stream-binding-local</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-binding-local</name>
+	<name>spring-cloud-stream-binding-local</name>
 	<description>Local(in memory) binding implementation</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-bindings-parent</artifactId>
+		<artifactId>spring-cloud-stream-bindings-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -21,11 +21,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-spi</artifactId>
+			<artifactId>spring-cloud-stream-binding-spi</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-test</artifactId>
+			<artifactId>spring-cloud-stream-binding-test</artifactId>
 		</dependency>
 	</dependencies>
 </project>

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">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>spring-cloud-streams-binding-rabbit</artifactId>
+  <artifactId>spring-cloud-stream-binding-rabbit</artifactId>
   <packaging>jar</packaging>
-  <name>spring-cloud-streams-binding-rabbit</name>
+  <name>spring-cloud-stream-binding-rabbit</name>
   <description>RabbitMQ binding implementation</description>
 
   <parent>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-streams-bindings-parent</artifactId>
+    <artifactId>spring-cloud-stream-bindings-parent</artifactId>
     <version>1.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
@@ -21,11 +21,11 @@
   <dependencies>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-streams-binding-spi</artifactId>
+      <artifactId>spring-cloud-stream-binding-spi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-streams-binding-test</artifactId>
+      <artifactId>spring-cloud-stream-binding-test</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

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">
   <modelVersion>4.0.0</modelVersion>
 	
-  <artifactId>spring-cloud-streams-binding-redis</artifactId>
+  <artifactId>spring-cloud-stream-binding-redis</artifactId>
   <packaging>jar</packaging>
-  <name>spring-cloud-streams-binding-redis</name>
+  <name>spring-cloud-stream-binding-redis</name>
   <description>Redis binding implementation</description>
 
   <parent>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-streams-bindings-parent</artifactId>
+    <artifactId>spring-cloud-stream-bindings-parent</artifactId>
     <version>1.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
@@ -21,11 +21,11 @@
   <dependencies>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-streams-binding-spi</artifactId>
+      <artifactId>spring-cloud-stream-binding-spi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-streams-binding-test</artifactId>
+      <artifactId>spring-cloud-stream-binding-test</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

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">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<artifactId>spring-cloud-streams-binding-spi</artifactId>
+	<artifactId>spring-cloud-stream-binding-spi</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-binding-spi</name>
+	<name>spring-cloud-stream-binding-spi</name>
 	<description>SPI for binding implementations</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-bindings-parent</artifactId>
+		<artifactId>spring-cloud-stream-bindings-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-codec</artifactId>
+			<artifactId>spring-cloud-stream-codec</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

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.

spring-cloud-stream-bindings/spring-cloud-stream-binding-test/pom.xml

@@ -4,16 +4,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-streams-binding-test</artifactId>
+	<artifactId>spring-cloud-stream-binding-test</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-streams-binding-test</name>
+	<name>spring-cloud-stream-binding-test</name>
 	<description>Test support for binding implementations</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-bindings-parent</artifactId>
+		<artifactId>spring-cloud-stream-bindings-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -110,11 +110,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-spi</artifactId>
+			<artifactId>spring-cloud-stream-binding-spi</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-codec</artifactId>
+			<artifactId>spring-cloud-stream-codec</artifactId>
 		</dependency>
 	</dependencies>
 </project>

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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-streams-codec</artifactId>
+	<artifactId>spring-cloud-stream-codec</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-codec</name>
+	<name>spring-cloud-stream-codec</name>
 	<description>Serialization library used by transport</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-parent</artifactId>
+		<artifactId>spring-cloud-stream-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-common</artifactId>
+			<artifactId>spring-cloud-stream-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.esotericsoftware</groupId>

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.

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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-streams-common</artifactId>
+	<artifactId>spring-cloud-stream-common</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-common</name>
+	<name>spring-cloud-stream-common</name>
 	<description>Spring Cloud Streams common components</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-parent</artifactId>
+		<artifactId>spring-cloud-stream-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 

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

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">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-streams-sample-sink</artifactId>
+	<artifactId>spring-cloud-stream-sample-double</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-streams-sample-sink</name>
+
+	<name>spring-cloud-stream-sample-double</name>
 	<description>Demo project for Spring XD module</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-streams-samples</artifactId>
+		<artifactId>spring-cloud-stream-samples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
@@ -23,11 +24,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams</artifactId>
+			<artifactId>spring-cloud-stream</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-streams-binding-redis</artifactId>
+			<artifactId>spring-cloud-stream-binding-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

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;
 

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;