INTSAMPLES-33 Update to SI RC1 and Spring 3.1

1. Cleanup of pom.xml files
2. Standardizing version numbers
3. Updating dependency versions
4. Cleaning/Standardizing project names
5. Removing Schema versions in XML context files

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</version>
-	<name>Spring Integration Cafe Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
 		<spring.integration.version>2.1.0.RC1</spring.integration.version>
-		<spring.version>3.1.0.RC1</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 
 	<dependencies>

applications/cafe/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>cafe</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Cafe Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Cafe Sample</name>
 	<properties>
-		<spring.integration.version>2.1.0.M3</spring.integration.version>
-        <spring.core.version>3.1.0.RC1</spring.core.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.core.version>3.1.0.RELEASE</spring.core.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
         <dependency>
@@ -37,12 +37,12 @@
 		<dependency>
 		    <groupId>org.codehaus.jackson</groupId>
 		    <artifactId>jackson-core-asl</artifactId>
-		    <version>1.8.3</version>
+		    <version>1.9.2</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.codehaus.jackson</groupId>
 		    <artifactId>jackson-mapper-asl</artifactId>
-		    <version>1.8.3</version>
+		    <version>1.9.2</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>

applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java

@@ -17,7 +17,6 @@
 package org.springframework.integration.samples.cafe.xml;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.samples.cafe.Cafe;
 import org.springframework.integration.samples.cafe.DrinkType;
 import org.springframework.integration.samples.cafe.Order;

applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java

@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Cold Drink 

applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java

@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Hot Drink 

applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java

@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Operations 

applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java

@@ -2,9 +2,6 @@ package org.springframework.integration.samples.cafe.xml;
 
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 public class CafeDemoAppUtilities {
 

applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml

@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 

applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml

@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 

applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml

@@ -4,11 +4,11 @@
     xmlns:rabbit="http://www.springframework.org/schema/rabbit"
     xmlns:cloud="http://schema.cloudfoundry.org/spring"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd">
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd">
 
     <!-- Set up the AmqpTemplate/RabbitTemplate: -->
     <rabbit:template id="amqpTemplate"

applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml

@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 

applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml

@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 

applications/loan-broker/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>loan-broker</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Loan Broker Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Loan Broker</name>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>

applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 
 	<channel id="loanQuotesChannel">
 		<interceptors>

applications/loanshark/pom.xml

@@ -2,12 +2,12 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<artifactId>loanshark</artifactId>
-	<name>Spring Integration Loan Shark Sample</name>
+	<name>Samples (Applications) - Loan Shark</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<aspectj.version>1.6.10</aspectj.version>
 		<slf4j.version>1.6.1</slf4j.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -343,7 +343,7 @@
     <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ip</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>2.1.0.RC1</version>
         </dependency>
     </dependencies>
 	<build>

applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 	<import resource="integrationContext.xml"/>
     <!--
 		This will automatically locate any and all property files you have

applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml

@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 

applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 				
 	<!-- The controllers are autodetected POJOs labeled with the @Controller annotation. -->
 	<context:component-scan base-package="org.springframework.integration.samples.loanbroker.loanshark" use-default-filters="false">

applications/pom.xml

@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>applications</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Sample Applications</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Applications</name>
 	<packaging>pom</packaging>
 
 	<modules>