diff --git a/common-build/ivyconf.xml b/common-build/ivyconf.xml
index 94bdaedb..cb532aec 100644
--- a/common-build/ivyconf.xml
+++ b/common-build/ivyconf.xml
@@ -82,9 +82,11 @@
 		<module organisation="org.springframework" name="spring-struts" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-support" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-toplink" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-tx" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-web" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-webflow" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-webmvc" resolver="spring-projects"/>
+		<module organisation="org.springframework" name="spring-webmvc-portlet" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-ws-core" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-ws-security" resolver="spring-projects"/>
 		<module organisation="org.springframework" name="spring-xml" resolver="spring-projects"/>
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index fea9dfc4..449a230a 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -13,13 +13,15 @@
 		<!-- global dependencies -->
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4"/>
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
-		<dependency org="javax.el" name="el-api" rev="1.0"/>
-		<dependency org="jboss" name="jboss-el" rev="1.0"/>
-		<dependency org="org.springframework" name="spring-beans" rev="2.0.6" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.0.6" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-context"	rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-core" rev="2.1-m3" />
 
+		<!-- build time only dependencies -->
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
+		
 		<!-- test dependencies -->
+		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
 		<dependency org="org.easymock" name="easymock" rev="2.2" 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"/>
diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs
index 63c85b13..dc8ffbcd 100644
--- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Tue Jul 31 15:11:23 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 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
diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs
index 64363ef0..e0d5724c 100644
--- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs
+++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs
@@ -1,8 +1,9 @@
-#Tue Jul 31 15:09:12 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_Spring Java Conventions
 formatter_settings_version=11
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
index 1973f017..7a3d18a6 100755
--- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
@@ -1,4 +1,5 @@
-#Mon Nov 13 17:23:47 PST 2006
+#Thu Aug 09 13:12:30 EDT 2007
 classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
 classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.common.component
index 98ca2d01..24a88ff7 100755
--- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.common.component
@@ -3,84 +3,7 @@
 <wb-module deploy-name="swf-sellitem-jsf">
 <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/standard.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-webmvc.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-webflow.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-web.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-core.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-context.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-binding.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-beans.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/ognl.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/log4j.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/junit.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/jstl.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-logging.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-codec.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-jdbc.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-dao.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/spring-aop.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/myfaces-impl.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/myfaces-api.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/hsqldb.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-lang.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-el.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-digester.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-collections.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/commons-beanutils.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/swf-sellitem-jsf/lib/global/aopalliance.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
+<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib/global"/>
 <property name="java-output-path" value="target/classes"/>
 <property name="context-root" value="swf-sellitem-jsf"/>
 </wb-module>
diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.validation.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.validation.prefs
index 1c7d6317..f5f51015 100644
--- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.wst.validation.prefs
@@ -1,6 +1,7 @@
-#Mon Nov 13 17:29:33 PST 2006
+#Thu Aug 09 13:12:30 EDT 2007
 DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
 USER_PREFERENCE=overrideGlobalPreferencesfalse
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/spring-webflow-samples/sellitem-jsf/ivy.xml b/spring-webflow-samples/sellitem-jsf/ivy.xml
index cd343818..aafad616 100644
--- a/spring-webflow-samples/sellitem-jsf/ivy.xml
+++ b/spring-webflow-samples/sellitem-jsf/ivy.xml
@@ -15,7 +15,7 @@
     <dependency org="taglibs" name="standard" rev="1.1.2"/>
     <dependency org="jstl" name="jstl" rev="1.1.2"/>
 	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
-    <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default,jsf"/>
+    <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default,jsf12"/>
     <dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
     <dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
     <dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 23134a1c..807f5642 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -14,7 +14,8 @@
 		<conf name="mvc" visibility="public" extends="global" />
 		<conf name="portlet" visibility="public" extends="mvc" />
 		<conf name="struts" visibility="public" extends="global" />
-		<conf name="jsf" visibility="public" extends="global" />
+		<conf name="jsf11" visibility="public" extends="global" />
+		<conf name="jsf12" visibility="public" extends="global" />
 		<conf name="testing" visibility="public" extends="global" />
 	</configurations>
 
@@ -22,60 +23,63 @@
 		<!--  global (core) dependencies -->
 		<dependency org="commons-logging" name="commons-logging" rev="1.0.4" />
 		<dependency org="ognl" name="ognl" rev="2.6.9" />
-		<dependency org="javax.el" name="el-api" rev="1.0"/>
 		<!-- Xerces and XML-apis are required only under JDK 1.4 for XSD support -->
 		<!-- Note: POMs are incorrect in m2 repo; ignoring since they are optional anyway
 		<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.6" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.1-m3" />
 		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.0.6" />
-		<dependency org="org.springframework" name="spring-context" rev="2.0.6" />
-		<dependency org="org.springframework" name="spring-web" rev="2.0.6" />
+		<dependency org="org.springframework" name="spring-core" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-context" rev="2.1-m3" />
+		<dependency org="org.springframework" name="spring-web" rev="2.1-m3" />
 		
 		<!-- testing support only dependencies -->
 		<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.6" conf="buildtime, mvc->default" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.1-m3" conf="buildtime, mvc->default" />
 
 		<!-- spring portlet mvc only dependencies -->
-		<dependency org="org.springframework" name="spring-portlet" rev="2.0.6" conf="buildtime, portlet->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.1-m3" 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.6" conf="buildtime, struts->default" />
 
-		<!-- JSF-only dependencies -->
+		<!-- JSF 1.2 only dependencies -->
 		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
-		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf->default"/>
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf->default"/>
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="buildtime, jsf12->default" >
+    		<exclude module="servlet-api"/>
+    	</dependency>
+    	<dependency org="commons-codec" name="commons-codec" rev="1.3" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="buildtime, jsf12->default" />
 
 		<!-- build time only dependencies -->
-		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
 		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
 		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="buildtime->default" />
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
 		
-		<dependency org="org.springframework" name="spring-dao" rev="2.0.6" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-hibernate3" rev="2.0.6" conf="buildtime->default" />
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default"/>
-		<dependency org="org.springframework" name="spring-jpa" rev="2.0.6" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-orm" rev="2.1-m3" conf="buildtime->default" />
+		<dependency org="org.springframework" name="spring-tx" rev="2.1-m3" conf="buildtime->default" />
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
 	
 		<!-- test time only dependencies -->
+		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
 		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" 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-jdbc" rev="2.0.6" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default" />
-		<dependency org="org.springframework" name="spring-agent" rev="2.0.6" conf="test->default" />
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.1-m3" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
 		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default"/>
-		<dependency org="org.hibernate" name="hibernate-tools" rev="3.2.0.beta9a" conf="test->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="test->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="test->default"/>
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="test->default" />
+		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="test->default" />
 
 	</dependencies>