diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..04c977932b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+target
+integration-repo
+ivy-cache
+spring-build
+bin
diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index da5e41d805..4113ace752 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -5,13 +5,13 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.adapter/src/main/resources/.gitignore b/org.springframework.integration.adapter/src/main/resources/.gitignore
new file mode 100644
index 0000000000..f935021a8f
--- /dev/null
+++ b/org.springframework.integration.adapter/src/main/resources/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/org.springframework.integration.adapter/src/test/java/.gitignore b/org.springframework.integration.adapter/src/test/java/.gitignore
new file mode 100644
index 0000000000..f935021a8f
--- /dev/null
+++ b/org.springframework.integration.adapter/src/test/java/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath
index da5e41d805..4113ace752 100644
--- a/org.springframework.integration.event/.classpath
+++ b/org.springframework.integration.event/.classpath
@@ -5,13 +5,13 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.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 20de9071db..d9ddc8d757 100644
--- a/org.springframework.integration.file/.classpath
+++ b/org.springframework.integration.file/.classpath
@@ -5,18 +5,18 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.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/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"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.test"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath
index da2ca7430a..24e4d68e93 100644
--- a/org.springframework.integration.http/.classpath
+++ b/org.springframework.integration.http/.classpath
@@ -5,22 +5,22 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <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.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-sources-3.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.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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.1.RELEASE-A/org.springframework.web.servlet-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.1.RELEASE-A/org.springframework.web.servlet-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/SI_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar" sourcepath="/SI_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-sources-3.1.0.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
+    <classpathentry kind="var" path="SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.1.RELEASE-A/org.springframework.web.servlet-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.1.RELEASE-A/org.springframework.web.servlet-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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" />
     <classpathentry kind="src" path="/org.springframework.integration.test" combineaccessrules="false" />
     <classpathentry kind="output" path="target/classes" />
diff --git a/org.springframework.integration.http/.springBeans b/org.springframework.integration.http/.springBeans
new file mode 100644
index 0000000000..ae3aaf11dc
--- /dev/null
+++ b/org.springframework.integration.http/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.1.201002191658-RC1]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath
index 48578fe207..126aa21e56 100644
--- a/org.springframework.integration.httpinvoker/.classpath
+++ b/org.springframework.integration.httpinvoker/.classpath
@@ -5,18 +5,18 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/SI_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.web/3.0.1.RELEASE-A/org.springframework.web-sources-3.0.1.RELEASE-A.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.httpinvoker/.springBeans b/org.springframework.integration.httpinvoker/.springBeans
new file mode 100644
index 0000000000..ae3aaf11dc
--- /dev/null
+++ b/org.springframework.integration.httpinvoker/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.1.201002191658-RC1]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/org.springframework.integration.ip/.classpath b/org.springframework.integration.ip/.classpath
index d722b83969..eb80a01c94 100644
--- a/org.springframework.integration.ip/.classpath
+++ b/org.springframework.integration.ip/.classpath
@@ -5,22 +5,21 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.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/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"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.test"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.stream"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.jdbc/.classpath b/org.springframework.integration.jdbc/.classpath
index 42118a5938..513055b68b 100644
--- a/org.springframework.integration.jdbc/.classpath
+++ b/org.springframework.integration.jdbc/.classpath
@@ -5,24 +5,24 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.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" />
-    <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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-10.5.1000001.764942.jar" sourcepath="/IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-sources-10.5.1000001.764942.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.1.RELEASE-A/org.springframework.jdbc-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.1.RELEASE-A/org.springframework.jdbc-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-10.5.1000001.764942.jar" sourcepath="/SI_IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-sources-10.5.1000001.764942.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.1.RELEASE-A/org.springframework.jdbc-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.1.RELEASE-A/org.springframework.jdbc-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath
index 7592410299..9cb50820c8 100644
--- a/org.springframework.integration.jms/.classpath
+++ b/org.springframework.integration.jms/.classpath
@@ -5,19 +5,19 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <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.activemq/com.springsource.org.apache.activemq/5.2.0/com.springsource.org.apache.activemq-5.2.0.jar" sourcepath="/IVY_CACHE/org.apache.activemq/com.springsource.org.apache.activemq/5.2.0/com.springsource.org.apache.activemq-sources-5.2.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.apache.geronimo.specs/com.springsource.javax.management.j2ee/1.0.1/com.springsource.javax.management.j2ee-1.0.1.jar" sourcepath="/IVY_CACHE/org.apache.geronimo.specs/com.springsource.javax.management.j2ee/1.0.1/com.springsource.javax.management.j2ee-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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/3.0.1.RELEASE-A/org.springframework.jms-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/3.0.1.RELEASE-A/org.springframework.jms-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/SI_IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.apache.activemq/com.springsource.org.apache.activemq/5.2.0/com.springsource.org.apache.activemq-5.2.0.jar" sourcepath="/SI_IVY_CACHE/org.apache.activemq/com.springsource.org.apache.activemq/5.2.0/com.springsource.org.apache.activemq-sources-5.2.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.apache.geronimo.specs/com.springsource.javax.management.j2ee/1.0.1/com.springsource.javax.management.j2ee-1.0.1.jar" sourcepath="/SI_IVY_CACHE/org.apache.geronimo.specs/com.springsource.javax.management.j2ee/1.0.1/com.springsource.javax.management.j2ee-sources-1.0.1.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.jms/3.0.1.RELEASE-A/org.springframework.jms-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.jms/3.0.1.RELEASE-A/org.springframework.jms-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.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.jmx/.classpath b/org.springframework.integration.jmx/.classpath
index aab3e7ceba..b2ed6c1329 100644
--- a/org.springframework.integration.jmx/.classpath
+++ b/org.springframework.integration.jmx/.classpath
@@ -5,13 +5,13 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath
index 7b7dd3a354..2bd326666c 100644
--- a/org.springframework.integration.mail/.classpath
+++ b/org.springframework.integration.mail/.classpath
@@ -5,20 +5,20 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.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" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-1.1.1.jar" sourcepath="/SI_IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-sources-1.1.1.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/SI_IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-sources-1.4.1.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/SI_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="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.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.rmi/.classpath b/org.springframework.integration.rmi/.classpath
index 276ef6a934..369a7c9551 100644
--- a/org.springframework.integration.rmi/.classpath
+++ b/org.springframework.integration.rmi/.classpath
@@ -5,16 +5,16 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.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 0492437274..c1768817c4 100644
--- a/org.springframework.integration.security/.classpath
+++ b/org.springframework.integration.security/.classpath
@@ -5,19 +5,19 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <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.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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-2.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-sources-2.0.5.RELEASE.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-2.0.5.RELEASE.jar" sourcepath="/SI_IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-sources-2.0.5.RELEASE.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath
index 0c6488d03b..a6bd0e1ff4 100644
--- a/org.springframework.integration.stream/.classpath
+++ b/org.springframework.integration.stream/.classpath
@@ -5,14 +5,14 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath
index 7a7f660d69..f40e92ace8 100644
--- a/org.springframework.integration.test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -5,21 +5,21 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.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" />
-    <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.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.1.RELEASE-A/org.springframework.context.support-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 1cbbd1812a..159fdebb1f 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -5,22 +5,22 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-1.3.0.jar" sourcepath="/IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-sources-1.3.0.jar"/>
-	<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.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.8.A/org.springframework.ws-1.5.8.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.8.A/org.springframework.ws-sources-1.5.8.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.8.A/org.springframework.oxm-1.5.8.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.8.A/org.springframework.oxm-sources-1.5.8.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-1.5.8.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-sources-1.5.8.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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="var" path="SI_IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-1.3.0.jar" sourcepath="/SI_IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-sources-1.3.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar" sourcepath="/SI_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="SI_IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="/SI_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="SI_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="/SI_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="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.8.A/org.springframework.ws-1.5.8.A.jar" sourcepath="/SI_IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.8.A/org.springframework.ws-sources-1.5.8.A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.8.A/org.springframework.oxm-1.5.8.A.jar" sourcepath="/SI_IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.8.A/org.springframework.oxm-sources-1.5.8.A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-1.5.8.A.jar" sourcepath="/SI_IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-sources-1.5.8.A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath
index 9d049c3ee6..3ecd207f82 100644
--- a/org.springframework.integration.xml/.classpath
+++ b/org.springframework.integration.xml/.classpath
@@ -5,21 +5,21 @@
     <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
     <classpathentry kind="src" path="src/test/resources" />
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <classpathentry kind="var" path="IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.bind/2.1.7/com.springsource.com.sun.xml.bind-2.1.7.jar" />
-    <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.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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.oxm/3.0.1.RELEASE-A/org.springframework.oxm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.oxm/3.0.1.RELEASE-A/org.springframework.oxm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-1.5.8.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-sources-1.5.8.A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.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 kind="var" path="SI_IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.bind/2.1.7/com.springsource.com.sun.xml.bind-2.1.7.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-1.1.1.jar" sourcepath="/SI_IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-sources-1.1.1.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar" sourcepath="/SI_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="SI_IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="/SI_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="SI_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="/SI_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="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.oxm/3.0.1.RELEASE-A/org.springframework.oxm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.oxm/3.0.1.RELEASE-A/org.springframework.oxm-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-1.5.8.A.jar" sourcepath="/SI_IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-sources-1.5.8.A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
+    <classpathentry kind="var" path="SI_IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/SI_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" />
 </classpath>
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 3646dc4d9d..3b296092c2 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/main/java" />
-    <classpathentry kind="src" path="src/main/resources" />
-    <classpathentry kind="src" output="target/test-classes" path="src/test/java" />
-    <classpathentry kind="src" path="src/test/resources" />
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.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" />
-    <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.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.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" />
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/SI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/SI_IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/SI_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="SI_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="/SI_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="SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.aop/3.0.1.RELEASE-A/org.springframework.aop-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.asm/3.0.1.RELEASE-A/org.springframework.asm-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.beans/3.0.1.RELEASE-A/org.springframework.beans-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.context/3.0.1.RELEASE-A/org.springframework.context-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.core/3.0.1.RELEASE-A/org.springframework.core-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.expression/3.0.1.RELEASE-A/org.springframework.expression-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.1.RELEASE-A/org.springframework.transaction-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-3.0.1.RELEASE-A.jar" sourcepath="/SI_IVY_CACHE/org.springframework/org.springframework.test/3.0.1.RELEASE-A/org.springframework.test-sources-3.0.1.RELEASE-A.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/SI_IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
+	<classpathentry kind="var" path="SI_IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/SI_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"/>
 </classpath>
-
diff --git a/org.springframework.integration/.springBeans b/org.springframework.integration/.springBeans
new file mode 100644
index 0000000000..ae3aaf11dc
--- /dev/null
+++ b/org.springframework.integration/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.1.201002191658-RC1]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-integration-samples/cafe/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/cafe/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..fa96d4c90e
--- /dev/null
+++ b/spring-integration-samples/cafe/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Wed Feb 24 19:23:36 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/spring-integration-samples/helloworld/.springBeans b/spring-integration-samples/helloworld/.springBeans
new file mode 100644
index 0000000000..ae3aaf11dc
--- /dev/null
+++ b/spring-integration-samples/helloworld/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.1.201002191658-RC1]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>