diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index e2e634d5..b47e32e4 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -13,14 +13,14 @@
 		<!-- global dependencies -->
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4"/>
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
-		<dependency org="org.springframework" name="spring-beans" rev="2.0.2" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.0.2" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.2" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.0.3" />
+		<dependency org="org.springframework" name="spring-context"	rev="2.0.3" />
+		<dependency org="org.springframework" name="spring-core" rev="2.0.3" />
 
 		<!-- test dependencies -->
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
-		<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
-		<dependency org="log4j" name="log4j" rev="1.2.13" conf="test->default"/>
+		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
+		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml
index 25342399..c0b9c90e 100644
--- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml
+++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml
@@ -4,7 +4,7 @@
        xmlns:flow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd">
 
diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml
index 711c661f..1b033e21 100644
--- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml
+++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<!-- Search form action that setups the form and processes form submissions -->
 	<bean id="formAction" class="org.springframework.webflow.action.FormAction">
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml
index 66a4c1cc..aa7bd74a 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+                           
 	<!-- Manages setting up, binding input to, and validating a Sale "backing wizard form object" -->
 	<bean id="formAction" class="org.springframework.webflow.action.FormAction">
 		<property name="formObjectClass" value="org.springframework.webflow.samples.sellitem.Sale"/>
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
index 6d132f90..fd2f782e 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
@@ -1,4 +1,21 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<html>
+<head>
+	<title>Sell Item - Select Category</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+
+<body>
+
+<div id="logo">
+	<img src="images/spring-logo.jpg" alt="Logo"> 
+</div>
 
 <div id="content">
 	<div id="insert"><img src="images/webflow-logo.jpg"/></div>
@@ -45,4 +62,9 @@
 	</table>
 </div>
 
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
+<div id="copyright">
+	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp
index 8dd43e98..95ce69bb 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp
@@ -1,4 +1,16 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<html>
+<head>
+	<title>Sell Item - Order Summary</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+
+<body>
 
 <div id="content">
 	<div id="insert"><img src="images/webflow-logo.jpg"/></div>
@@ -68,4 +80,9 @@
 	</table>
 </div>
 
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
+<div id="copyright">
+	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp
deleted file mode 100644
index dfe41438..00000000
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="copyright">
-	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp
deleted file mode 100644
index 416cad5f..00000000
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ page session="false" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<html>
-<head>
-<title>Sell an item</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body>
-
-<div id="logo">
-	<img src="images/spring-logo.jpg" alt="Logo"> 
-</div>
-
-<div id="navigation">
-
-</div>
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp
index ab220892..507e8fdd 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp
@@ -1,4 +1,20 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<html>
+<head>
+	<title>Sell Item - Enter Price and Item Count</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+
+<body>
+
+<div id="logo">
+	<img src="images/spring-logo.jpg" alt="Logo"> 
+</div>
 
 <div id="content">
 	<div id="insert"><img src="images/webflow-logo.jpg"/></div>
@@ -24,4 +40,9 @@
 	</table>
 </div>
 
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
+<div id="copyright">
+	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
index e6c9a61c..11d5ce56 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
@@ -1,4 +1,21 @@
-<%@ include file="includeTop.jsp" %>
+<%@ page contentType="text/html" %>
+<%@ page session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<html>
+<head>
+	<title>Sell Item - Enter Shipping Information</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+
+<body>
+
+<div id="logo">
+	<img src="images/spring-logo.jpg" alt="Logo"> 
+</div>
 
 <div id="content">
 	<div id="insert"><img src="images/webflow-logo.jpg"/></div>
@@ -48,4 +65,9 @@
 	</table>
 </div>
 
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
+<div id="copyright">
+	<p>&copy; Copyright 2004-2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/index.jsp b/spring-webflow-samples/sellitem/src/main/webapp/index.jsp
index 45801400..0b72e6a5 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/index.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/index.jsp
@@ -1,58 +1,32 @@
-<%@ page session="true" %> <%-- make sure we have a session --%>
-<HTML>
-	<BODY>
-		<DIV align="left">Sell Item - A Spring Web Flow Sample</DIV>
-		
-		<HR>
-		
-		<DIV align="left">
-			<P>
-				<A href="pos.htm?_flowId=sellitem-flow">Sell Item</A>
-			</P>
-			
-			<P>
-				This Spring Web Flow sample application implements the example application
-				discussed in the article
-				<A href="http://www-128.ibm.com/developerworks/java/library/j-contin.html">
-				Use continuations to develop complex Web applications</A>. It illustrates
-				the following concepts:
-				<UL>
-					<LI>
-						Using the "_flowId" request parameter to let the view tell the web
-						flow controller which flow needs to be started.
-					</LI>
-					<LI>
-						Implementing a wizard using web flows.
-					</LI>
-					<LI>
-						Use of the FormAction to perform form processing, including the 
-						FormAction's "setupForm" method to install custom property editors for
-						formatting text field values (shipDate).
-					</LI>					
-					<LI>
-						Using continuations to make the flow completely stable, no matter
-						how browser navigation buttons are used.
-					</LI>
-					<LI>
-					    Using "conversation invalidation after completion" to prevent duplicate submits 
-					    of the same sale while taking advantage of continuations to allow back button 
-					    usage while the application transaction is in process.
-					</LI>
-					<LI>
-						"Always redirect on pause" to benefit from the POST+REDIRECT+GET pattern with no special coding.
-					</LI>
-					<LI>
-						Using <A href="http://www.ognl.org/">OGNL</A> based conditional expressions.
-					</LI>
-					<LI>
-						Use of subflows to compose a multi-step business process from independently reusable modules.
-					</LI>
-				</UL>
-			</P>
-		</DIV>
-		
-		<HR>
-
-		<DIV align="right"></DIV>
-	</BODY>
-</HTML>
+<%-- make sure we have a session --%>
+<%@ page session="true" %>
+<html>
+<body>
+	<div align="left">Sell Item - A Spring Web Flow Sample</DIV>
+	<hr>
+	<div align="left">
+		<p>
+			<a href="pos.htm?_flowId=sellitem-flow">Sell Item</A>
+		</p>
+		<p>
+			This Spring Web Flow sample application implements the example application
+			discussed in the article <a href="http://www-128.ibm.com/developerworks/java/library/j-contin.html">
+			Use continuations to develop complex Web applications</a>.
+			It illustrates the following concepts:
+		</p>
+		<ul>
+			<li>Using the "_flowId" request parameter to let the view tell the web flow controller which flow needs to be started.</li>
+			<li>Implementing a wizard using web flows.</li>
+			<li>
+				Use of the FormAction to perform form processing, including the FormAction's "setupForm" method to install custom					property editors for formatting text field values (shipDate).
+				</li>
+			<li>Using continuations to make the flow completely stable, no matter how browser navigation buttons are used.</li>
+			<li>
+				Using "conversation invalidation after completion" to prevent duplicate submits of the same sale
+				while taking advantage of continuations to allow back button usage while the application transaction is in process.				</li>
+			<li>"Always redirect on pause" to benefit from the POST+REDIRECT+GET pattern with no special coding.</li>				<li>Using <A href="http://www.ognl.org/">OGNL</A> based conditional expressions.</li>
+			<li>Use of subflows to compose a multi-step business process from independently reusable modules.</li>
+		</ul>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index bfccffb5..36318691 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -27,24 +27,24 @@
 		<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
 		<dependency org="xml-apis" name="xml-apis" rev="1.3.03"/>
 		-->
-		<dependency org="org.springframework" name="spring-beans" rev="2.0.2" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.0.3" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.2" />
-		<dependency org="org.springframework" name="spring-context" rev="2.0.2" />
-		<dependency org="org.springframework" name="spring-web" rev="2.0.2" />
+		<dependency org="org.springframework" name="spring-core" rev="2.0.3" />
+		<dependency org="org.springframework" name="spring-context" rev="2.0.3" />
+		<dependency org="org.springframework" name="spring-web" rev="2.0.3" />
 		
 		<!-- testing support only dependencies -->
-		<dependency org="junit" name="junit" rev="3.8.1" conf="buildtime, testing->default" />
+		<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
 
 		<!-- spring mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.0.2" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.0.3" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-portlet" rev="2.0.2" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-portlet" rev="2.0.3" conf="buildtime, portlet->default" />
 
 		<!-- struts only dependencies -->
 		<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
-		<dependency org="org.springframework" name="spring-struts" rev="2.0.2" conf="buildtime, struts->default" />
+		<dependency org="org.springframework" name="spring-struts" rev="2.0.3" conf="buildtime, struts->default" />
 
 		<!-- JSF-only dependencies -->
 		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
@@ -57,10 +57,10 @@
 		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
 
 		<!-- test time only dependencies -->
-		<dependency org="log4j" name="log4j" rev="1.2.13" conf="test->default" />
+		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.0.2" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.0.3" conf="test->default" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file