diff --git a/spring-binding/src/main/resources/.gitignore b/spring-binding/src/main/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-js-resources/src/test/java/.gitignore b/spring-js-resources/src/test/java/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-js-resources/src/test/resources/.gitignore b/spring-js-resources/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
index ed8e7733..8223f501 100755
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
@@ -159,5 +159,8 @@
     </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="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
 </project-modules>
diff --git a/spring-webflow-samples/booking-faces/.springBeans b/spring-webflow-samples/booking-faces/.springBeans
index 79d41891..b2a5d7f4 100755
--- a/spring-webflow-samples/booking-faces/.springBeans
+++ b/spring-webflow-samples/booking-faces/.springBeans
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.5.v200805032123]]></pluginVersion>
+	<pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[true]]></enableImports>
 	<configs>
+		<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-webflow-samples/booking-faces/src/test/resources/.gitignore b/spring-webflow-samples/booking-faces/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
index 9edf2f8f..1bfbb1d0 100755
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
@@ -183,5 +183,8 @@
     </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="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
 </project-modules>
diff --git a/spring-webflow-samples/booking-mvc/src/test/resources/.gitignore b/spring-webflow-samples/booking-mvc/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
index 7e2fdf22..2fd06f3a 100644
--- a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
@@ -165,5 +165,7 @@
     </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="/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-webflow-samples/booking-portlet-faces/src/test/java/.gitignore b/spring-webflow-samples/booking-portlet-faces/src/test/java/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore b/spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
index 1c3d8695..6d9b89e2 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
@@ -147,5 +147,8 @@
     </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="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
   </wb-module>
 </project-modules>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore b/spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
index b2afd169..c9b76ff8 100644
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
@@ -99,5 +99,7 @@
     </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="/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-webflow-samples/jsf-booking/src/test/java/.gitignore b/spring-webflow-samples/jsf-booking/src/test/java/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-samples/jsf-booking/src/test/resources/.gitignore b/spring-webflow-samples/jsf-booking/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b