INTSAMPLES-89 - Upgrade to Spring Integration 2.2 RC3

* Test samples
* Polish documentation
* Polish code

For reference see: https://jira.springsource.org/browse/INTSAMPLES-89

README.md

@@ -3,14 +3,14 @@ Spring Integration Samples
 
 # Introduction
 
-Welcome to the Spring Integration Samples. To simplify your experience, Spring Integration Samples were split into 4 distinct categories:
+Welcome to the **Spring Integration Samples** repository which provides **50+ samples** to help you learn [Spring Integration][]. To simplify your experience, the *Spring Integration* samples are split into 4 distinct categories:
 
 * Basic
 * Intermediate
 * Advanced
 * Applications
 
-Inside of each category you'll find a 'README.md' which will contain a more detailed description of that category's specifics. Each sample also comes with its own 'readme.txt' file explaining details.
+Inside of each category you'll find a **README.md** file, which will contain a more detailed description of that category. Each sample also comes with its own **README.md** file explaining further details, e.g. how to run the respective sample.
 
 *Happy Integration!*
 
@@ -31,21 +31,26 @@ Below is a short description of each category.
 
 This is a good place to get started. The samples here are technically motivated and demonstrate the bare minimum with regard to configuration and code to help you to get introduced to the basic concepts, API and configuration of Spring Integration. For example, if you are looking for an answer on how to wire a **Service Activator**  to a **Channel** or how to apply a **Gateway** to your message exchange or how to get started with using the **MAIL** or **XML** module, this would be the right place to find a relevant sample. The bottom line is that this is a good starting point.
 
-* **amqp** - demonstrates the functionality of the various **AMQP Adapters**
-* **control-bus** - demonstrates the functionality of the **Control Bus**
-* **feed** - demonstrates the functionality of the **Feed Adapter** (RSS/ATOM)
-* **file** - demonstrates aspects of the various File Adapters (e.g. **File Inbound/Outbound Channel Adapters**, file **polling**)
-* **ftp** - demonstrates the **FTP support** available with Spring Integration
-* **helloworld** - very simple starting example illustrating a basic message flow (using **Channel**, **ServiceActivator**, **QueueChannel**)
-* **http** - demonstrates request/reply communication when using a pair of **HTTP Inbound/Outbound gateways**
-* **jms** - demonstrates **JMS** support available with Spring Integration
-* **jmx** - demonstrates **JMX** support using a **JMX Attribute Polling Channel** and **JMX Operation Invoking Channel Adapter**
-* **mail** - example showing **IMAP** and **POP3** support
+* **amqp** - Demonstrates the functionality of the various **AMQP Adapters**
+* **control-bus** - Demonstrates the functionality of the **Control Bus**
+* **enricher** - This sample demonstrates how the Enricher components can be used
+* **feed** - Demonstrates the functionality of the **Feed Adapter** (RSS/ATOM)
+* **file** - Demonstrates aspects of the various File Adapters (e.g. **File Inbound/Outbound Channel Adapters**, file **polling**)
+* **ftp** - Demonstrates the **FTP support** available with Spring Integration
+* **helloworld** - Very simple starting example illustrating a basic message flow (using **Channel**, **ServiceActivator**, **QueueChannel**)
+* **http** - Demonstrates request/reply communication when using a pair of **HTTP Inbound/Outbound gateways**
+* **jdbc** - Illustrates the usage of the Jdbc Adapters, including object persistence and retrieval
+* **jms** - Demonstrates **JMS** support available with Spring Integration
+* **jmx** - Demonstrates **JMX** support using a **JMX Attribute Polling Channel** and **JMX Operation Invoking Channel Adapter**
+* **jpa** - Shows the usage of the JPA Components can be used
+* **mail** - Example showing **IMAP** and **POP3** support
+* **mongodb** - Shows how to persist a Message payload to a **MongoDb** document store and how to read documents from **MongoDb**
 * **oddeven** - Example combining the functionality of **Inbound Channel Adapter**, **Filter**, **Router** and **Poller**
 * **jpa** - This sample illustrates how the JPA Components can be used
 * **quote** - Example demoing core EIP support using **Channel Adapter (Inbound and Stdout)**, **Poller** with Interval Trigers, **Service Activator**
-* **sftp** - demonstrating SFTP support using **SFTP Inbound / Outbound Channel Adapters**
-* **tcp-client-server** - demonstrates socket communication using **TcpOutboundGateway**, **TcpInboundGateway** and also uses a **Gateway** and a **Service Activator**
+* **sftp** - Demonstrating SFTP support using **SFTP Inbound / Outbound Channel Adapters**
+* **tcp-amqp** - Demonstrates basic functionality of bridging the **Spring Integration TCP Adapters** with **Spring Integration AMQP Adapters**
+* **tcp-client-server** - Demonstrates socket communication using **TcpOutboundGateway**, **TcpInboundGateway** and also uses a **Gateway** and a **Service Activator**
 * **testing-examples** - A series of test cases that show techniques to **test** Spring Integration applications.
 * **twitter** - Illustrates Twitter support using the **Twitter Inbound Channel Adapter**, **Twitter Inbound Search Channel Adapter**, **Twitter Outbound Channel Adapter**
 * **ws-inbound-gateway** - Example showing basic functionality of the **Web Service Gateway**
@@ -58,36 +63,41 @@ This is a good place to get started. The samples here are technically motivated
 
 This category targets developers who are already more familiar with the Spring Integration framework (past getting started), but need some more guidance while resolving more advanced technical problems that you have to deal with when switching to a Messaging architecture. For example, if you are looking for an answer on how to handle errors in various scenarios, or how to properly configure an **Aggregator** for the situations where some messages might not ever arrive for aggregation, or any other issue that goes beyond a basic understanding and configuration of a particular component to address "what else you can do?" types of problems, this would be the right place to find relevant examples.
 
+* **async-gateway** - Usage example of an asynchronous **Gateway**
 * **dynamic-poller** - Example shows usage of a **Poller** with a custom **Trigger** to change polling periods at runtime
 * **async-gateway** - Example shows usage of an **Asynchronous Gateway**
 * **errorhandling** - Demonstrates basic **Error Handling** capabilities of Spring Integration
 * **file-processing** - Sample demonstrates how to wire a message flow to process files either sequentially (maintain the order) or concurrently (no order).
 * **mail-attachments** - Demonstrates the processing of email attachments
+* **monitoring** The project used in the *[Spring Integration Management and Monitoring Webinar](http://www.springsource.org/node/3598)* Also available on the *[SpringSourceDev YouTube Channel](http://www.youtube.com/SpringSourceDev)*
 * **multipart-http** - Demonstrates the sending of HTTP multipart requests using Spring's **RestTemplate** and a Spring Integration **Http Outbound Gateway**
-* **travel** - More sophisticated example showing the retrieval of weather (SOAP Web Service) and traffic (HTTP Service) reports using real services
-* **tcp-client-server-multiplex** - Demonstrates the use of *Collaborating Channel Adapters*
-* **stored-procedures-derby**  Provides an example of the stored procedure Outbound Gateway using *[Apache Derby](http://db.apache.org/derby/)*
-* **stored-procedures-oracle** Provides an example of the stored procedure Outbound Gateway using *ORACLE XE*
-* **stored-procedures-postgresql** Provides an example of the stored procedure Outbound Gateway using *[PostgreSQL](http://www.postgresql.org/)*
 * **rest-http** - This sample demonstrates how to send an HTTP request to a Spring Integration's HTTP service while utilizing Spring Integration's new HTTP Path usage. This sample also uses Spring Security for HTTP Basic authentication. With HTTP Path facility, the client program can send requests with URL Variables.
+* **retry-and-more** Provides samples showing the application of MessageHandler Advice Chains to endpoints - retry, circuit breaker, expression evaluating
 * **splitter-aggregator-reaper** A demonstration of implementing the Splitter and Aggregator *Enterprise Integration Patterns* (EIP) together. This sample also provides a concrete example of a [message store reaper][] in action.
 * **stored-procedures-derby**  Provides an example of the stored procedure Outbound Gateway using *[Apache Derby](http://db.apache.org/derby/)*
+* **stored-procedures-ms** Provides an example of the stored procedure Outbound Gateway using *Microsoft SQL Server*
 * **stored-procedures-oracle** Provides an example of the stored procedure Outbound Gateway using *ORACLE XE*
-* **monitoring** The project used in the *[Spring Integration Management and Monitoring Webinar](http://www.springsource.org/node/3598)* Also available on the *[SpringSourceDev YouTube Channel](http://www.youtube.com/SpringSourceDev)*
-* **retry-and-more** Provides samples showing the application of MessageHandler Advice Chains to endpoints - retry, circuit breaker, expression evaluating
-* **tx-synch** Provides a sample demonstrating the use of transaction syncrhonization, renaming an input file to a different filename, depending on whether the transaction commits, or rolls back.
+* **stored-procedures-postgresql** Provides an example of the stored procedure Outbound Gateway using *[PostgreSQL](http://www.postgresql.org/)*
+* **tcp-client-server-multiplex** - Demonstrates the use of *Collaborating Channel Adapters*
+* **travel** - More sophisticated example showing the retrieval of weather (SOAP Web Service) and traffic (HTTP Service) reports using real services
+* **tx-synch** Provides a sample demonstrating the use of transaction synchronization, renaming an input file to a different filename, depending on whether the transaction commits, or rolls back.
 
 ## Advanced
 
 This category targets advanced developers who are quite familiar with Spring Integration but are looking to address a specific custom need by extending the Spring Integration public API. For example, if you are looking for samples showing how to implement a custom **Channel** or **Consumer** (event-based or polling-based), or you are trying to figure out what is the most appropriate way to implement a custom **BeanParser** on top of the Spring Integration BeanParser hierarchy when implementing a custom namespace, this would be the right place to look. Here you can also find samples that will help you with adapter development. Spring Integration comes with an extensive library of adapters that allow you to connect remote systems with the Spring Integration messaging framework. However you might have a need to integrate with a system for which the core framework does not provide an adapter, so you have to implement your own. This category would include samples showing you how to implement various adapters.
 
 * **advanced-testing-examples** - Example test cases that show advanced techniques to test Spring Integration applications
+* **dynamic-ftp** - Demonstrates one technique for sending files to dynamic destinations.
 
 ## Applications
 
 This category targets developers and architects who have a good understanding of Message-Driven architecture and Enterprise Integration Patterns, and have an above average understanding of Spring and Spring integration and who are looking for samples that address a particular business problem. In other words, the emphasis of samples in this category is '**business use cases**' and how they can be solved via a Messaging architecture and Spring Integration in particular. For example, if you are interested to see how a Loan Broker process or Travel Agent process could be implemented and automated via Spring Integration, this would be the right place to find these types of samples.
 
-* **cafe** - Emulates a simple operation of a coffee shop combining various Spring Integration adapters (Including **Router** and **Splitter**) see [Appendix A of the reference documentation](http://static.springsource.org/spring-integration/docs/latest-ga/reference/html/samples.html) for more details
+* **cafe** - Emulates a simple operation of a coffee shop combining various Spring Integration adapters (Including **Router** and **Splitter**) see [Appendix A of the reference documentation](http://static.springsource.org/spring-integration/docs/latest-ga/reference/html/samples.html) for more details. Implementations are provided for:
+  - AMQP
+  - JMS
+  - In memory channels 
+* **cafe-scripted** - Scripted implementation of the classic **cafe** sample application. Supports **JavaScript**, **Groovy**, **Ruby**, and **Python**.
 * **loan-broker** - Simulates a simple banking application (Uses **Gateway**, **Chain**, **Header Enricher**, **Recipient List Router**, **Aggregator**) see [Appendix A of the reference documentation](http://static.springsource.org/spring-integration/docs/latest-ga/reference/html/samples.html) for more details
 * **loanshark** This extension to the loan broker sample shows how to exchange messages between Spring Integration applications (and other technologies) using **UDP**.
 

advanced/advanced-testing-examples/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-testing-examples</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Advanced) - Advanced Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
-		<spring.version>3.1.0.RELEASE</spring.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.2.0.RC3</spring.integration.version>
+		<spring.version>3.1.3.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>

advanced/dynamic-ftp/pom.xml

@@ -2,14 +2,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
  <artifactId>dynamic-ftp</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Advanced) - Dynamic FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.framework.version>3.1.0.RELEASE</spring.framework.version>
-		<spring.integration.version>2.2.0.M1</spring.integration.version>
-		<log4j.version>1.2.16</log4j.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
+		<spring.integration.version>2.2.0.RC3</spring.integration.version>
+		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
@@ -54,17 +54,18 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>2.5.1</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 					<compilerArgument>-Xlint:all</compilerArgument>
 					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
+					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
 			<plugin>
 			  <artifactId>maven-surefire-plugin</artifactId>
+			  <version>2.12.4</version>
 			  <configuration>
 			    <includes>
 			      <include>**/*Tests.java</include>

advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java

@@ -26,7 +26,6 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
-import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.support.MessageBuilder;
 
@@ -50,14 +49,14 @@ public void runDemo() throws Exception{
 			channel.send(message);
 		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
+			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1"));
 		}
 		// send another so we can see in the log we don't create the ac again.
 		try {
 			channel.send(message);
 		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
+			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1"));
 		}
 		// send to a different customer; again, check the log to see a new ac is built
 		message = MessageBuilder.withPayload(file)
@@ -66,21 +65,21 @@ public void runDemo() throws Exception{
 			channel.send(message);
 		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertEquals("host.for.cust2", e.getCause().getCause().getMessage());
+			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust2"));
 		}
-		
-		// send to a different customer; again, check the log to see a new ac is built 
+
+		// send to a different customer; again, check the log to see a new ac is built
 		//and the first one created (cust1) should be closed and removed as per the max cache size restriction
 		message = MessageBuilder.withPayload(file)
 				.setHeader("customer", "cust3").build();
 		try {
 			channel.send(message);
 		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertEquals("host.for.cust3", e.getCause().getCause().getMessage());
+			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust3"));
 		}
-		
-		//send to cust1 again, since this one has been invalidated before, we should 
+
+		//send to cust1 again, since this one has been invalidated before, we should
 		//see a new ac created (with ac of cust2 destroyed and removed)
 		message = MessageBuilder.withPayload(file)
 				.setHeader("customer", "cust1").build();

advanced/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-samples</artifactId>
-	<version>2.1.0.RELEASE</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<name>Spring Integration Samples - Advanced</name>
 	<packaging>pom</packaging>
 

applications/cafe-scripted/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>cafe-scripted</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
-		<spring.version>3.1.0.RELEASE</spring.version>
-		<log4j.version>1.2.16</log4j.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.2.0.RC3</spring.integration.version>
+		<spring.version>3.1.3.RELEASE</spring.version>
+		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
 
@@ -114,13 +114,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>2.5.1</version>
 				<configuration>
-					<source>1.5</source>
+					<source>1.6</source>
 					<target>1.6</target>
 					<compilerArgument>-Xlint:all</compilerArgument>
 					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
+					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
 		</plugins>

applications/cafe/cafe-amqp/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>cafe</artifactId>
 		<groupId>org.springframework.integration.samples</groupId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cafe-amqp</artifactId>