INTSAMPLES-127 Polishing

- PR Comments - Switch to Jackson2 - Fix oxm config Polishing INTSAMPLES-127 Update to SI 4.0.0.RC1 INTSAMPLES-127 Remove Servlet Dependency travel sample; see INT-3350. INTSAMPLES-127 Update Samples to SI 4.0.0 JIRA: https://jira.spring.io/browse/INTSAMPLES-127 Created `maint` branch for ongoing SI 3.0.x samples.
bennettyates · Apr 16, 2014 · cc57922 · cc57922
1 parent c5b1ace
commit cc57922
Show file tree

Hide file tree

Showing 93 changed files with 262 additions and 292 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 Spring Integration Samples
 ==========================
 
+# Note
+
+This (master) branch requires Spring Integration 4.0 or above. For samples running against earlier versions of Spring Integration, use the __maint__ branch.
+
 # Introduction
 
 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:

diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
@@ -14,8 +14,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.11</junit.version>
 	</properties>

diff --git a/...c/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/...c/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java
@@ -30,11 +30,11 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageChannel;
-import org.springframework.integration.MessagingException;
-import org.springframework.integration.core.MessageHandler;
-import org.springframework.integration.core.SubscribableChannel;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessagingException;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.SubscribableChannel;
 
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.support.converter.SimpleMessageConverter;

diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
@@ -7,10 +7,10 @@
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
-		<junit.version>4.10</junit.version>
+		<junit.version>4.11</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -34,6 +34,11 @@
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<testResources>

diff --git a/.../src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java b/.../src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java
@@ -25,7 +25,7 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.integration.MessageChannel;
+import org.springframework.messaging.MessageChannel;
 
 /**
  * Demonstrates how a dynamic Spring Integration flow snippet can be used

diff --git a/...test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java b/...test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java
@@ -18,7 +18,7 @@
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.integration.MessageChannel;
+import org.springframework.messaging.MessageChannel;
 
 /**
  * @author Gary Russell

diff --git a/...est/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/...est/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,22 @@
  */
 package org.springframework.integration.samples.ftp;
 
+import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.net.UnknownHostException;
 
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageChannel;
-import org.springframework.integration.MessagingException;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessagingException;
 
 /**
  * @author Gary Russell
@@ -47,25 +50,28 @@ public void runDemo() throws Exception{
 						.build();
 		try {
 			channel.send(message);
-		} catch (MessagingException e) {
-			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1"));
+		}
+		catch (MessagingException e) {
+			assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
+			assertTrue(e.getCause().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);
-			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1"));
+		}
+		catch (MessagingException e) {
+			assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
+			assertTrue(e.getCause().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)
 				.setHeader("customer", "cust2").build();
 		try {
 			channel.send(message);
-		} catch (MessagingException e) {
-			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust2"));
+		}
+		catch (MessagingException e) {
+			assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
+			assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust2"));
 		}
 
 		// send to a different customer; again, check the log to see a new ac is built
@@ -74,9 +80,10 @@ public void runDemo() throws Exception{
 				.setHeader("customer", "cust3").build();
 		try {
 			channel.send(message);
-		} catch (MessagingException e) {
-			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust3"));
+		}
+		catch (MessagingException e) {
+			assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
+			assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust3"));
 		}
 
 		//send to cust1 again, since this one has been invalidated before, we should
@@ -85,9 +92,10 @@ public void runDemo() throws Exception{
 				.setHeader("customer", "cust1").build();
 		try {
 			channel.send(message);
-		} catch (MessagingException e) {
-			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
-			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
+		}
+		catch (MessagingException e) {
+			assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
+			assertEquals("host.for.cust1", e.getCause().getCause().getCause().getMessage());
 		}
 
 		ctx.close();

diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
@@ -8,8 +8,8 @@
 	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>

diff --git a/...afe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml b/...afe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml
@@ -21,7 +21,7 @@
 
 	<!-- Obtain a connection to the RabbitMQ via cloudfoundry-runtime: -->
 	<beans profile="cloud">
-		<cloud:rabbit-connection-factory id="rabbitConnectionFactory" />
+<!-- 		<cloud:rabbit-connection-factory id="rabbitConnectionFactory" /> -->
 	</beans>
 
 	<!-- connect to the local broker using the default user name and password -->

diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
@@ -21,8 +21,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -49,9 +49,9 @@
 				<version>1.9.2</version>
 		</dependency>
 		<dependency>
-				<groupId>org.codehaus.jackson</groupId>
-				<artifactId>jackson-mapper-asl</artifactId>
-				<version>1.9.2</version>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>2.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>

diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
@@ -8,7 +8,7 @@
 	<name>Samples (Applications) - Loan Broker</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>

diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
@@ -8,9 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	    <spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
-		<aspectj.version>1.6.10</aspectj.version>
+	    <spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<slf4j.version>1.6.1</slf4j.version>
 	</properties>
 	<repositories>
@@ -49,11 +48,6 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>${aspectj.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -99,11 +93,6 @@
 			<artifactId>spring-aop</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aspects</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
@@ -345,43 +334,6 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.0</version>
-				<dependencies>
-					<!-- NB: You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
-					<dependency>
-						<groupId>org.aspectj</groupId>
-						<artifactId>aspectjrt</artifactId>
-						<version>${aspectj.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.aspectj</groupId>
-						<artifactId>aspectjtools</artifactId>
-						<version>${aspectj.version}</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<outxml>true</outxml>
-					<aspectLibraries>
-						<aspectLibrary>
-							<groupId>org.springframework</groupId>
-							<artifactId>spring-aspects</artifactId>
-						</aspectLibrary>
-					</aspectLibraries>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -416,30 +368,6 @@
 				<version>2.5</version>
 			</plugin>
 			<!-- IDE -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.7</version>  <!--  Note 2.8 does not work with AspectJ aspect path -->
-				<configuration>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>false</downloadJavadocs>
-					<wtpversion>2.0</wtpversion>
-					<additionalBuildcommands>
-						<buildCommand>
-							<name>org.eclipse.ajdt.core.ajbuilder</name>
-							<arguments>
-								<aspectPath>org.springframework.aspects</aspectPath>
-							</arguments>
-						</buildCommand>
-						<buildCommand>
-							<name>org.springframework.ide.eclipse.core.springbuilder</name>
-						</buildCommand>
-					</additionalBuildcommands>
-					<additionalProjectnatures>
-						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-					</additionalProjectnatures>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-idea-plugin</artifactId>

diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>

diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>