diff --git a/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs b/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs
index 61810d8175..35ade795c8 100644
--- a/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Sat Jul 10 12:27:30 BST 2010
+#Sat Sep 04 08:01:10 EDT 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
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 2911432a91..abb2f42b94 100644
--- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
+++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-integration-ip/spring-integration-ip">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-integration-core/spring-integration-core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-integration-stream/spring-integration-stream">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/spring-integration-stream/.classpath b/spring-integration-stream/.classpath
index f14ce4afb4..7406f09944 100644
--- a/spring-integration-stream/.classpath
+++ b/spring-integration-stream/.classpath
@@ -5,6 +5,11 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-stream/.project b/spring-integration-stream/.project
index cc507ad98e..08b7f9ad19 100644
--- a/spring-integration-stream/.project
+++ b/spring-integration-stream/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -15,9 +20,17 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<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>
 	</natures>
 </projectDescription>
diff --git a/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs b/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs
index 42e95bfdb0..35ade795c8 100644
--- a/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
-#Wed May 26 00:59:51 CEST 2010
+#Sat Sep 04 08:01:10 EDT 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -11,6 +13,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore