Skip to content

Commit

Permalink
INTSAMPLES-137: Add WebSockets sample
Browse files Browse the repository at this point in the history 
JIRA: https://jira.spring.io/browse/INTSAMPLES-137

Depends on spring-projects/spring-integration#1274

Polishing and cleanup

* Fix `cafe-dsl` project: https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1131
* Change author emails to the `pivotal.io`
* Regenerate poms

Fix for `Cafe-DSL` sample

https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1143
  • Loading branch information
@artembilan @garyrussell
artembilan authored and garyrussell committed Sep 26, 2014
1 parent 1914a54 commit a5c1234
Show file tree
Hide file tree
Showing 67 changed files with 1,792 additions and 933 deletions.
36 changes: 18 additions & 18 deletions advanced/advanced-testing-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced-testing-examples</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<name>Advanced Testing Examples</name>
<description>Advanced Testing Examples</description>
<url>http://projects.spring.io/spring-integration</url>
Expand All @@ -23,28 +23,28 @@
<developer>
<id>garyrussell</id>
<name>Gary Russell</name>
<email>grussell@gopivotal.com</email>
<email>grussell@pivotal.io</email>
<roles>
<role>project lead</role>
</roles>
</developer>
<developer>
<id>markfisher</id>
<name>Mark Fisher</name>
<email>mfisher@gopivotal.com</email>
<email>mfisher@pivotal.io</email>
<roles>
<role>project founder and lead emeritus</role>
</roles>
</developer>
<developer>
<id>ghillert</id>
<name>Gunnar Hillert</name>
<email>ghillert@gopivotal.com</email>
<email>ghillert@pivotal.io</email>
</developer>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@gopivotal.com</email>
<email>abilan@pivotal.io</email>
</developer>
</developers>
<scm>
Expand All @@ -60,10 +60,16 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>4.0.0.RELEASE</version>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -78,6 +84,12 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.7.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms-api</artifactId>
Expand All @@ -90,23 +102,11 @@
<version>1.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>4.0.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
34 changes: 17 additions & 17 deletions advanced/dynamic-ftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-ftp</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<name>Dynamic FTP Demo</name>
<description>Dynamic FTP Demo</description>
<url>http://projects.spring.io/spring-integration</url>
Expand All @@ -23,28 +23,28 @@
<developer>
<id>garyrussell</id>
<name>Gary Russell</name>
<email>grussell@gopivotal.com</email>
<email>grussell@pivotal.io</email>
<roles>
<role>project lead</role>
</roles>
</developer>
<developer>
<id>markfisher</id>
<name>Mark Fisher</name>
<email>mfisher@gopivotal.com</email>
<email>mfisher@pivotal.io</email>
<roles>
<role>project founder and lead emeritus</role>
</roles>
</developer>
<developer>
<id>ghillert</id>
<name>Gunnar Hillert</name>
<email>ghillert@gopivotal.com</email>
<email>ghillert@pivotal.io</email>
</developer>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@gopivotal.com</email>
<email>abilan@pivotal.io</email>
</developer>
</developers>
<scm>
Expand All @@ -60,12 +60,6 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>4.0.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -78,23 +72,29 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.7.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
10 changes: 5 additions & 5 deletions advanced/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>
Expand All @@ -21,28 +21,28 @@
<developer>
<id>garyrussell</id>
<name>Gary Russell</name>
<email>grussell@gopivotal.com</email>
<email>grussell@pivotal.io</email>
<roles>
<role>project lead</role>
</roles>
</developer>
<developer>
<id>markfisher</id>
<name>Mark Fisher</name>
<email>mfisher@gopivotal.com</email>
<email>mfisher@pivotal.io</email>
<roles>
<role>project founder and lead emeritus</role>
</roles>
</developer>
<developer>
<id>ghillert</id>
<name>Gunnar Hillert</name>
<email>ghillert@gopivotal.com</email>
<email>ghillert@pivotal.io</email>
</developer>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@gopivotal.com</email>
<email>abilan@pivotal.io</email>
</developer>
</developers>
<scm>
Expand Down
38 changes: 19 additions & 19 deletions applications/cafe-scripted/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-scripted</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<name>Cafe Sample (Scripted Implementation)</name>
<description>Cafe Sample (Scripted Implementation)</description>
<url>http://projects.spring.io/spring-integration</url>
Expand All @@ -23,28 +23,28 @@
<developer>
<id>garyrussell</id>
<name>Gary Russell</name>
<email>grussell@gopivotal.com</email>
<email>grussell@pivotal.io</email>
<roles>
<role>project lead</role>
</roles>
</developer>
<developer>
<id>markfisher</id>
<name>Mark Fisher</name>
<email>mfisher@gopivotal.com</email>
<email>mfisher@pivotal.io</email>
<roles>
<role>project founder and lead emeritus</role>
</roles>
</developer>
<developer>
<id>ghillert</id>
<name>Gunnar Hillert</name>
<email>ghillert@gopivotal.com</email>
<email>ghillert@pivotal.io</email>
</developer>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@gopivotal.com</email>
<email>abilan@pivotal.io</email>
</developer>
</developers>
<scm>
Expand All @@ -62,14 +62,14 @@
<dependencies>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>4.0.0.RELEASE</version>
<artifactId>spring-integration-groovy</artifactId>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-rmi</artifactId>
<version>4.0.0.RELEASE</version>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -85,15 +85,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>4.0.0.RELEASE</version>
<scope>compile</scope>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.7.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.2.2</version>
<version>2.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -110,8 +110,8 @@
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>4.0.0.RELEASE</version>
<artifactId>spring-integration-stream</artifactId>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -127,10 +127,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.3.RELEASE</version>
<scope>test</scope>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>4.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit a5c1234

Please sign in to comment.