diff --git a/build.properties b/build.properties
index c88ae6e55a..5fa841edc1 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=1.0.4
+version=2.0.0
 release.type=integration
 natural.name=spring-integration
 project.name=Spring Integration
@@ -7,5 +7,5 @@ ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 javadoc.exclude.package.names=org/springframework/integration/samples/**
 # dependency versions
-spring.version=2.5.6.A
-junit.version=4.4.0
+spring.version=3.0.0.CI-336
+junit.version=4.6.0
diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index bc5775b3b9..bcc85ecb8a 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -5,10 +5,12 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath
index bc5775b3b9..bcc85ecb8a 100644
--- a/org.springframework.integration.event/.classpath
+++ b/org.springframework.integration.event/.classpath
@@ -5,10 +5,12 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath
index 81bc0ff0f5..e60640f529 100644
--- a/org.springframework.integration.file/.classpath
+++ b/org.springframework.integration.file/.classpath
@@ -5,11 +5,13 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath
index 9338d2c1a1..ebe76b9d9c 100644
--- a/org.springframework.integration.http/.classpath
+++ b/org.springframework.integration.http/.classpath
@@ -9,13 +9,15 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.6.A/org.springframework.web-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/2.5.6.A/org.springframework.web-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/2.5.6.A/org.springframework.web.servlet-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/2.5.6.A/org.springframework.web.servlet-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-336/org.springframework.web-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-336/org.springframework.web-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.CI-336/org.springframework.web.servlet-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.CI-336/org.springframework.web.servlet-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>		
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath
index c0ce3459d2..a0ed2061ae 100644
--- a/org.springframework.integration.httpinvoker/.classpath
+++ b/org.springframework.integration.httpinvoker/.classpath
@@ -7,13 +7,15 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.6.A/org.springframework.web-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/2.5.6.A/org.springframework.web-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-336/org.springframework.web-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-336/org.springframework.web-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath
index 20c6fbebf4..649ae11cc9 100644
--- a/org.springframework.integration.jms/.classpath
+++ b/org.springframework.integration.jms/.classpath
@@ -6,13 +6,15 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/2.5.6.A/org.springframework.jms-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/2.5.6.A/org.springframework.jms-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.CI-336/org.springframework.jms-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.CI-336/org.springframework.jms-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath
index 907efc5da6..9c87698cd5 100644
--- a/org.springframework.integration.mail/.classpath
+++ b/org.springframework.integration.mail/.classpath
@@ -7,12 +7,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-1.1.1.jar" sourcepath="/IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-sources-1.4.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.6.A/org.springframework.context.support-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.6.A/org.springframework.context.support-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-336/org.springframework.context.support-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-336/org.springframework.context.support-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
diff --git a/org.springframework.integration.rmi/.classpath b/org.springframework.integration.rmi/.classpath
index a65071fb22..a89c5e4223 100644
--- a/org.springframework.integration.rmi/.classpath
+++ b/org.springframework.integration.rmi/.classpath
@@ -6,12 +6,14 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath
index cd1ec8285e..75a61ce83f 100644
--- a/org.springframework.integration.security/.classpath
+++ b/org.springframework.integration.security/.classpath
@@ -7,13 +7,15 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security/2.0.4.A/org.springframework.security-2.0.4.A.jar" sourcepath="/IVY_CACHE/org.springframework.security/org.springframework.security/2.0.4.A/org.springframework.security-sources-2.0.4.A.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath
index 86c1d69f1c..e95dd78c36 100644
--- a/org.springframework.integration.stream/.classpath
+++ b/org.springframework.integration.stream/.classpath
@@ -5,11 +5,13 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 6005adecc0..be1233394c 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -8,14 +8,16 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar" sourcepath="/IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-sources-1.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="/IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-sources-1.0.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.5.A/org.springframework.ws-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.5.A/org.springframework.ws-sources-1.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-sources-1.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>	
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath
index 8f52066a19..6342513617 100644
--- a/org.springframework.integration.xml/.classpath
+++ b/org.springframework.integration.xml/.classpath
@@ -9,14 +9,16 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar" sourcepath="IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-sources-2.1.7.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-sources-1.0.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-sources-1.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.5.A/org.springframework.oxm.java5-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.5.A/org.springframework.oxm.java5-sources-1.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 3ce55bae9e..ca82b0fe2e 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -9,14 +9,16 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.6.A/org.springframework.aop-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.6.A/org.springframework.context.support-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.6.A/org.springframework.context.support-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-sources-2.5.6.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-336/org.springframework.aop-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-336/org.springframework.asm-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-336/org.springframework.beans-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-336/org.springframework.context-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-336/org.springframework.context.support-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-336/org.springframework.context.support-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-336/org.springframework.core-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-336/org.springframework.expression-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-3.0.0.CI-336.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-336/org.springframework.transaction-sources-3.0.0.CI-336.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-3.0.0.CI-336.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-336/org.springframework.test-sources-3.0.0.CI-336.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>