diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index 15843f82..26324858 100644
--- a/applications/cafe/pom.xml
+++ b/applications/cafe/pom.xml
@@ -7,7 +7,7 @@
 	<version>2.0.0</version>
 	<name>Spring Integration Cafe Sample</name>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java b/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
index 7f5da92f..11766fa6 100644
--- a/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
+++ b/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
@@ -19,7 +19,6 @@ package org.springframework.integration.samples.cafe.annotation;
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
 import org.springframework.integration.samples.cafe.Cafe;
 import org.springframework.integration.samples.cafe.DrinkType;
 import org.springframework.integration.samples.cafe.Order;
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index a6f70203..36046725 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -7,7 +7,7 @@
 	<version>2.0.0</version>
 	<name>Spring Integration Loan Broker Sample</name>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.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>
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 9cf95a57..a9d494c1 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 		<roo.version>1.1.0.M3</roo.version>
-		<spring.version>3.0.4.RELEASE</spring.version>
-		<aspectj.version>1.6.10.M1</aspectj.version>
+		<spring.version>3.0.5.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>
 	</properties>
@@ -361,7 +361,7 @@
     <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ip</artifactId>
-            <version>2.0.0.M7</version>
+            <version>2.0.0.RC1</version>
         </dependency>
     </dependencies>
 	<build>
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index eee07fda..bbf406d4 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration File Copy Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
index b213c23f..ccd9beb5 100644
--- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
+++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
@@ -31,9 +31,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class BinaryFileCopyTest {
 
 	@Test
-	public void testBinaryCopy(){
+	public void testBinaryCopy() throws Exception{
 		ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-binary.xml", BinaryFileCopyTest.class);
 		FileCopyDemoCommon.displayDirectories(context);
+		Thread.sleep(5000);
 	}
 
 }
diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
index 6f07874b..e123eb08 100644
--- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
+++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
@@ -29,9 +29,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class FileBasedFileCopyTest {
 
 	@Test
-	public void testFileBasedCopy(){
+	public void testFileBasedCopy() throws Exception{
 		ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-file.xml", FileBasedFileCopyTest.class);
 		FileCopyDemoCommon.displayDirectories(context);
+		Thread.sleep(5000);
 	}
 
 }
diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
index e063dca1..2ff35e68 100644
--- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
+++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
@@ -30,9 +30,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class TextFileCopyTest {
 
 	@Test
-	public void testTextBasedCopy(){
+	public void testTextBasedCopy() throws Exception{
 		ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-text.xml", TextFileCopyTest.class);
 		FileCopyDemoCommon.displayDirectories(context);
+		Thread.sleep(5000);
 	}
 	
 }
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index 6befbc9a..55dcb606 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration Hello World Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/jms/.settings/com.springsource.sts.config.flow.prefs b/basic/jms/.settings/com.springsource.sts.config.flow.prefs
new file mode 100644
index 00000000..dddf9d44
--- /dev/null
+++ b/basic/jms/.settings/com.springsource.sts.config.flow.prefs
@@ -0,0 +1,3 @@
+#Sun Oct 03 04:56:44 EDT 2010
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/jms/src/test/java/org/springframework/integration/samples/jms/config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="GatewayModelElement" type\="gateway">\n<structure end\="842" endstart\="842" start\="691" startend\="842"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="878" endstart\="878" start\="848" startend\="878"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="982" endstart\="982" start\="882" startend\="982"/>\n<bounds height\="112" width\="116" x\="291" y\="17"/>\n</element>\n</graph>
+eclipse.preferences.version=1
diff --git a/basic/jms/.springBeans b/basic/jms/.springBeans
new file mode 100644
index 00000000..7dbdff8c
--- /dev/null
+++ b/basic/jms/.springBeans
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.3.201007151000-M2]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/test/java/org/springframework/integration/samples/jms/config.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 2a948714..1dd2e9d8 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration JMS Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<activemq.version>5.2.0</activemq.version>
 	</properties>
 	<dependencies>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index e2b34e0a..79c817f4 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 7f222462..9207f4ec 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -6,7 +6,7 @@
 	<name>Spring Integration IMAP IDLE Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index 565b80ec..53e4882b 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index 66b86d3d..f0789f43 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index 9eff63b4..45ef8cb1 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -8,8 +8,8 @@
 	<name>Spring Integration TCP Client Server Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.version>3.0.3.RELEASE</spring.version>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index 23dabce5..5c51a015 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -8,8 +8,8 @@
 	<version>2.0.0</version>	
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
-		<spring.version>3.0.4.RELEASE</spring.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index d3face5e..32ae6e39 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 		<saaj.version>1.3</saaj.version>
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index 3ad5d303..4611bef8 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 9c1cd634..256f46b3 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -7,7 +7,7 @@
 	<name>Async Gateway Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index cda3c1f0..b8a56d7d 100644
--- a/intermediate/errorhandling/pom.xml
+++ b/intermediate/errorhandling/pom.xml
@@ -7,7 +7,7 @@
 	<name>Spring Integration Error Handling Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index 641854bb..c65b93d6 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>file-processing</artifactId>
   <version>2.0.0</version>
 <properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 2508ebb2..34d71177 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -7,8 +7,8 @@
 	<name>Spring Integration HTTP Multipart Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
-		<spring.version>3.0.4.RELEASE</spring.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.16</log4j.version>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index 1a6f761e..eb79b20f 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -6,10 +6,10 @@
 	<name>Spring Integration Travel Services Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<spring.integration.version>2.0.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
-		<spring.version>3.0.4.RELEASE</spring.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/intermediate/travel/src/test/resources/log4j.properties b/intermediate/travel/src/test/resources/log4j.properties
new file mode 100644
index 00000000..978e3006
--- /dev/null
+++ b/intermediate/travel/src/test/resources/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootCategory=WARN, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
+
+
+log4j.category.org.springframework=WARN
+# log4j.category.org.springframework.integration=DEBUG
+# log4j.category.org.springframework.integration.jdbc=DEBUG
+log4j.category.org.springframework.integration.samples=DEBUG
diff --git a/intermediate/travel/src/test/resources/log4j.xml b/intermediate/travel/src/test/resources/log4j.xml
deleted file mode 100644
index f391e2ed..00000000
--- a/intermediate/travel/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Loggers -->
-	<logger name="org.springframework">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.springframework.integration.samples">
-		<level value="debug" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="console" />
-	</root>
-	
-</log4j:configuration>
\ No newline at end of file