diff --git a/spring-integration-samples/helloworld/.classpath b/spring-integration-samples/helloworld/.classpath
index 96489ff1c9..f42fb64cfa 100644
--- a/spring-integration-samples/helloworld/.classpath
+++ b/spring-integration-samples/helloworld/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-samples/helloworld/.project b/spring-integration-samples/helloworld/.project
index 0f7761adfa..dea589e1ba 100644
--- a/spring-integration-samples/helloworld/.project
+++ b/spring-integration-samples/helloworld/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/spring-integration-samples/jmx/.classpath b/spring-integration-samples/jmx/.classpath
index a7ac8abdba..f42fb64cfa 100644
--- a/spring-integration-samples/jmx/.classpath
+++ b/spring-integration-samples/jmx/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
diff --git a/spring-integration-samples/loan-broker/.classpath b/spring-integration-samples/loan-broker/.classpath
index 96489ff1c9..f42fb64cfa 100644
--- a/spring-integration-samples/loan-broker/.classpath
+++ b/spring-integration-samples/loan-broker/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-samples/loan-broker/.project b/spring-integration-samples/loan-broker/.project
index be2565f916..7b2c933859 100644
--- a/spring-integration-samples/loan-broker/.project
+++ b/spring-integration-samples/loan-broker/.project
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/spring-integration-samples/loanshark/.classpath b/spring-integration-samples/loanshark/.classpath
index 6fa4142331..9411eaf88d 100644
--- a/spring-integration-samples/loanshark/.classpath
+++ b/spring-integration-samples/loanshark/.classpath
@@ -1,76 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java|**/*.aj"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java|**/*.aj"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/javax/persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar" sourcepath="M2_REPO/javax/persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="M2_REPO/javax/servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0/com.springsource.javax.servlet.jsp.jstl-1.2.0.jar" sourcepath="M2_REPO/javax/servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0/com.springsource.javax.servlet.jsp.jstl-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="M2_REPO/javax/transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/validation/com.springsource.javax.validation/1.0.0.GA/com.springsource.javax.validation-1.0.0.GA.jar" sourcepath="M2_REPO/javax/validation/com.springsource.javax.validation/1.0.0.GA/com.springsource.javax.validation-1.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-2.7.6.jar" sourcepath="M2_REPO/org/antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-2.7.6-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/edu/emory/mathcs/backport/com.springsource.edu.emory.mathcs.backport/3.1.0/com.springsource.edu.emory.mathcs.backport-3.1.0.jar" sourcepath="M2_REPO/edu/emory/mathcs/backport/com.springsource.edu.emory.mathcs.backport/3.1.0/com.springsource.edu.emory.mathcs.backport-3.1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent/1.3.4/com.springsource.edu.oswego.cs.dl.util.concurrent-1.3.4.jar" sourcepath="M2_REPO/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent/1.3.4/com.springsource.edu.oswego.cs.dl.util.concurrent-1.3.4-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga.jar" sourcepath="M2_REPO/org/jboss/javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="M2_REPO/net/sourceforge/cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/ehcache/com.springsource.net.sf.ehcache/1.4.1/com.springsource.net.sf.ehcache-1.4.1.jar" sourcepath="M2_REPO/net/sourceforge/ehcache/com.springsource.net.sf.ehcache/1.4.1/com.springsource.net.sf.ehcache-1.4.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/sourceforge/jsr107cache/com.springsource.net.sf.jsr107cache/1.0.0/com.springsource.net.sf.jsr107cache-1.0.0.jar" sourcepath="M2_REPO/net/sourceforge/jsr107cache/com.springsource.net.sf.jsr107cache/1.0.0/com.springsource.net.sf.jsr107cache-1.0.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="M2_REPO/org/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.beanutils/1.8.0/com.springsource.org.apache.commons.beanutils-1.8.0.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.beanutils/1.8.0/com.springsource.org.apache.commons.beanutils-1.8.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.digester/1.8.1/com.springsource.org.apache.commons.digester-1.8.1.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.digester/1.8.1/com.springsource.org.apache.commons.digester-1.8.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.fileupload/1.2.0/com.springsource.org.apache.commons.fileupload-1.2.0.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.fileupload/1.2.0/com.springsource.org.apache.commons.fileupload-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.io/1.4.0/com.springsource.org.apache.commons.io-1.4.0.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.io/1.4.0/com.springsource.org.apache.commons.io-1.4.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/el/com.springsource.org.apache.el/6.0.20/com.springsource.org.apache.el-6.0.20.jar" sourcepath="M2_REPO/org/apache/el/com.springsource.org.apache.el/6.0.20/com.springsource.org.apache.el-6.0.20-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="M2_REPO/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="M2_REPO/org/apache/taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles/2.1.3/com.springsource.org.apache.tiles-2.1.3.jar" sourcepath="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles/2.1.3/com.springsource.org.apache.tiles-2.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.core/2.1.3/com.springsource.org.apache.tiles.core-2.1.3.jar" sourcepath="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.core/2.1.3/com.springsource.org.apache.tiles.core-2.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.jsp/2.1.3/com.springsource.org.apache.tiles.jsp-2.1.3.jar" sourcepath="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.jsp/2.1.3/com.springsource.org.apache.tiles.jsp-2.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.servlet/2.1.3/com.springsource.org.apache.tiles.servlet-2.1.3.jar" sourcepath="M2_REPO/org/apache/tiles/com.springsource.org.apache.tiles.servlet/2.1.3/com.springsource.org.apache.tiles.servlet-2.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-1.4.2.jar" sourcepath="M2_REPO/org/codehaus/jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-1.4.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-1.4.2.jar" sourcepath="M2_REPO/org/codehaus/jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-1.4.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/dom4j/com.springsource.org.dom4j/1.6.1/com.springsource.org.dom4j-1.6.1.jar" sourcepath="M2_REPO/org/dom4j/com.springsource.org.dom4j/1.6.1/com.springsource.org.dom4j-1.6.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga.jar" sourcepath="M2_REPO/org/hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations/3.3.1.ga/com.springsource.org.hibernate.annotations-3.3.1.ga.jar" sourcepath="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations/3.3.1.ga/com.springsource.org.hibernate.annotations-3.3.1.ga-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga/com.springsource.org.hibernate.annotations.common-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga/com.springsource.org.hibernate.annotations.common-3.3.0.ga-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.ejb/3.3.2.GA/com.springsource.org.hibernate.ejb-3.3.2.GA.jar" sourcepath="M2_REPO/org/hibernate/com.springsource.org.hibernate.ejb/3.3.2.GA/com.springsource.org.hibernate.ejb-3.3.2.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.validator/4.0.0.GA/com.springsource.org.hibernate.validator-4.0.0.GA.jar" sourcepath="M2_REPO/org/hibernate/com.springsource.org.hibernate.validator/4.0.0.GA/com.springsource.org.hibernate.validator-4.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="M2_REPO/org/hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/util/com.springsource.org.jboss.util/2.0.4.GA/com.springsource.org.jboss.util-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/util/com.springsource.org.jboss.util/2.0.4.GA/com.springsource.org.jboss.util-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/joda/com.springsource.org.joda.time/1.6.0/com.springsource.org.joda.time-1.6.0.jar" sourcepath="M2_REPO/org/joda/com.springsource.org.joda.time/1.6.0/com.springsource.org.joda.time-1.6.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="M2_REPO/org/junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar" sourcepath="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" sourcepath="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/tuckey/com.springsource.org.tuckey.web.filters.urlrewrite/3.1.0/com.springsource.org.tuckey.web.filters.urlrewrite-3.1.0.jar" sourcepath="M2_REPO/org/tuckey/com.springsource.org.tuckey.web.filters.urlrewrite/3.1.0/com.springsource.org.tuckey.web.filters.urlrewrite-3.1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/slf4j/com.springsource.slf4j.api/1.5.6/com.springsource.slf4j.api-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/com.springsource.slf4j.api/1.5.6/com.springsource.slf4j.api-1.5.6-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/slf4j/com.springsource.slf4j.log4j/1.5.6/com.springsource.slf4j.log4j-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/com.springsource.slf4j.log4j/1.5.6/com.springsource.slf4j.log4j-1.5.6-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.aop/3.0.2.RELEASE/org.springframework.aop-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.aop/3.0.2.RELEASE/org.springframework.aop-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.asm/3.0.2.RELEASE/org.springframework.asm-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.asm/3.0.2.RELEASE/org.springframework.asm-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.aspects/3.0.2.RELEASE/org.springframework.aspects-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.aspects/3.0.2.RELEASE/org.springframework.aspects-3.0.2.RELEASE-sources.jar">
-    <attributes>
-      <attribute name="org.eclipse.ajdt.aspectpath" value="true"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.beans/3.0.2.RELEASE/org.springframework.beans-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.beans/3.0.2.RELEASE/org.springframework.beans-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.context/3.0.2.RELEASE/org.springframework.context-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.context/3.0.2.RELEASE/org.springframework.context-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.core/3.0.2.RELEASE/org.springframework.core-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.core/3.0.2.RELEASE/org.springframework.core-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.expression/3.0.2.RELEASE/org.springframework.expression-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.expression/3.0.2.RELEASE/org.springframework.expression-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/integration/org.springframework.integration/2.0.0.M3/org.springframework.integration-2.0.0.M3.jar" sourcepath="M2_REPO/org/springframework/integration/org.springframework.integration/2.0.0.M3/org.springframework.integration-2.0.0.M3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/integration/org.springframework.integration.adapter/2.0.0.M3/org.springframework.integration.adapter-2.0.0.M3.jar" sourcepath="M2_REPO/org/springframework/integration/org.springframework.integration.adapter/2.0.0.M3/org.springframework.integration.adapter-2.0.0.M3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/integration/org.springframework.integration.ip/2.0.0.M3/org.springframework.integration.ip-2.0.0.M3.jar" sourcepath="M2_REPO/org/springframework/integration/org.springframework.integration.ip/2.0.0.M3/org.springframework.integration.ip-2.0.0.M3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.jdbc/3.0.2.RELEASE/org.springframework.jdbc-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.jdbc/3.0.2.RELEASE/org.springframework.jdbc-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE.jar" sourcepath="M2_REPO/org/springframework/webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.orm/3.0.2.RELEASE/org.springframework.orm-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.orm/3.0.2.RELEASE/org.springframework.orm-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/roo/org.springframework.roo.annotations/1.0.2.RELEASE/org.springframework.roo.annotations-1.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/roo/org.springframework.roo.annotations/1.0.2.RELEASE/org.springframework.roo.annotations-1.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.test/3.0.2.RELEASE/org.springframework.test-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.test/3.0.2.RELEASE/org.springframework.test-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.transaction/3.0.2.RELEASE/org.springframework.transaction-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.transaction/3.0.2.RELEASE/org.springframework.transaction-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.web/3.0.2.RELEASE/org.springframework.web-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.web/3.0.2.RELEASE/org.springframework.web-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.web.servlet/3.0.2.RELEASE/org.springframework.web.servlet-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/org.springframework.web.servlet/3.0.2.RELEASE/org.springframework.web.servlet-3.0.2.RELEASE-sources.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-integration-samples/loanshark/.project b/spring-integration-samples/loanshark/.project
index d845ba2443..5e568f1c85 100644
--- a/spring-integration-samples/loanshark/.project
+++ b/spring-integration-samples/loanshark/.project
@@ -1,37 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>loanshark</name>
-  <comment/>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.ajdt.core.ajbuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.validation.validationbuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.ajdt.core.ajbuilder</name>
-      <arguments>
-        <dictionary>
-          <key>aspectPath</key>
-          <value>org.springframework.aspects</value>
-        </dictionary>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.springframework.ide.eclipse.core.springbuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.ajdt.ui.ajnature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>com.springsource.sts.roo.core.nature</nature>
-    <nature>org.springframework.ide.eclipse.core.springnature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>loanshark</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
+			<arguments>
+				<dictionary>
+					<key>aspectPath</key>
+					<value>org.springframework.aspects</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>com.springsource.sts.roo.core.nature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs
index dc2026daf4..ed662b07b8 100644
--- a/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Wed Mar 24 13:06:08 PDT 2010
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+#Fri May 28 19:48:06 CEST 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
index 08ac5c9818..4fe5ca7bd4 100644
--- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
+++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
@@ -186,5 +186,10 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
   </wb-module>
 </project-modules>
diff --git a/spring-integration-samples/ws-inbound-gateway/.classpath b/spring-integration-samples/ws-inbound-gateway/.classpath
index 830cc9bd58..02d04a45fe 100644
--- a/spring-integration-samples/ws-inbound-gateway/.classpath
+++ b/spring-integration-samples/ws-inbound-gateway/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
diff --git a/spring-integration-samples/ws-inbound-gateway/.project b/spring-integration-samples/ws-inbound-gateway/.project
index 23cd58e05e..bc2b2f9ebe 100644
--- a/spring-integration-samples/ws-inbound-gateway/.project
+++ b/spring-integration-samples/ws-inbound-gateway/.project
@@ -26,21 +26,21 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
diff --git a/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
index f11f831818..0a8f20b3f0 100644
--- a/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Thu Feb 25 18:31:06 PST 2010
+#Fri May 28 19:45:14 CEST 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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3ca4f04559..13ac87e9d8 100644
--- a/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-integration-samples/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="jst.java" version="5.0"/>
   <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.java" version="6.0"/>
 </faceted-project>
diff --git a/spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs
index e2d5e80cc0..74d312fca6 100644
--- a/spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Tue Jun 30 15:22:48 EDT 2009
+#Fri May 28 19:45:26 CEST 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