diff --git a/spring-binding/.classpath b/spring-binding/.classpath
index e069e453..49134477 100644
--- a/spring-binding/.classpath
+++ b/spring-binding/.classpath
@@ -5,15 +5,15 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.ognl/ognl/ognl-2.6.9.jar" sourcepath="IVY_CACHE/org.ognl/ognl/ognl-sources-2.6.9.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.el/com.springsource.org.jboss.el/2.0.0.GA/com.springsource.org.jboss.el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.ognl/com.springsource.org.ognl/2.6.9/com.springsource.org.ognl-2.6.9.jar" sourcepath="IVY_CACHE/org.ognl/ognl/ognl-sources-2.6.9.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.3.A/org.springframework.beans-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.3.A/org.springframework.context-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.3.A/org.springframework.core-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index 5e33e86e..050ca4e4 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -21,20 +21,24 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-context"	rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.3.A" conf="compile->compile"/>
 
 		<!-- build time only dependencies -->
-		<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default"/>
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
+		<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="compile->compile"/>
+		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default"/>
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="test->compile"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->compile"/>
+		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-faces/.classpath b/spring-faces/.classpath
index ca6c80c6..d7e6ebb1 100644
--- a/spring-faces/.classpath
+++ b/spring-faces/.classpath
@@ -7,27 +7,27 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-1.7.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-sources-1.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-collections/commons-collections-3.2.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-digester/commons-digester-1.8.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-digester/commons-digester-sources-1.8.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.shale/shale-test/shale-test-1.0.4.jar" sourcepath="IVY_CACHE/org.apache.shale/shale-test/shale-test-sources-1.0.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.richfaces.framework/richfaces-api/richfaces-api-3.1.4.GA.jar" sourcepath="IVY_CACHE/org.richfaces.framework/richfaces-api/richfaces-api-sources-3.1.4.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-api/jsf-api-1.2.08.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.faces/jsf-impl/jsf-impl-1.2.08.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.beanutils/1.7.0/com.springsource.org.apache.commons.beanutils-1.7.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-sources-1.7.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.digester/1.8.0/com.springsource.org.apache.commons.digester-1.8.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-digester/commons-digester-sources-1.8.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.shale/com.springsource.org.apache.shale.test/1.0.4/com.springsource.org.apache.shale.test-1.0.4.jar" sourcepath="IVY_CACHE/org.apache.shale/shale-test/shale-test-sources-1.0.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.el/com.springsource.org.jboss.el/2.0.0.GA/com.springsource.org.jboss.el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.richfaces/com.springsource.org.richfaces/3.1.4.GA/com.springsource.org.richfaces-3.1.4.GA.jar" sourcepath="IVY_CACHE/org.richfaces.framework/richfaces-api/richfaces-api-sources-3.1.4.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.3.A/org.springframework.beans-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.3.A/org.springframework.context-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.3.A/org.springframework.core-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.3.A/org.springframework.test-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.3.A/org.springframework.web-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/2.5.3.A/org.springframework.web.servlet-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.08/com.springsource.javax.faces-1.2.0.08.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/com.springsource.com.sun.faces/1.2.0.08/com.springsource.com.sun.faces-1.2.0.08.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-js"/>
-	<classpathentry kind="var" path="IVY_CACHE/com.sun.facelets/jsf-facelets/jsf-facelets-1.1.14.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/com.sun.facelets/com.springsource.com.sun.facelets/1.1.14/com.springsource.com.sun.facelets-1.1.14.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index a27bb9bd..1ac38ca7 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -23,31 +23,38 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
 
 		<!-- build time only dependencies -->
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default" />		
-		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
-		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="optional->default"/>	
-		<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="optional->default" />
+		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile" />		
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile" />
+		<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="optional->compile">
+			<exclude org="javax.faces" />
+		</dependency>	
+		<dependency org="org.richfaces" name="com.springsource.org.richfaces" rev="3.1.4.GA" conf="optional->compile">
+			<exclude org="javax.faces" />
+		</dependency>
 		
 		<!-- JSF 1.2 dependencies -->
-		<dependency org="javax.faces" name="jsf-api" rev="1.2.08" conf="provided, jsf12->default" />
-		<dependency org="javax.faces" name="jsf-impl" rev="1.2.08" conf="provided, jsf12->default" />
+		<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.08" conf="provided, jsf12->compile" />
+		<dependency org="com.sun.faces" name="com.springsource.com.sun.faces" rev="1.2.0.08" conf="provided, jsf12->compile" />
     	
     	<!-- JSF 1.1 dependencies -->
-    	<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.5" conf="jsf11->default" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.1.5" conf="jsf11->default" />
+    	<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.1.5" conf="jsf11->compile" />
+		<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces" rev="1.1.5" conf="jsf11->compile" />
     	
 		<!-- test dependencies -->
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
-		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->compile" />
+		<dependency org="org.apache.shale" name="com.springsource.org.apache.shale.test" rev="1.0.4" conf="test->compile" />
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile" />
 		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-js/.classpath b/spring-js/.classpath
index 8546b382..fc0e7b5a 100644
--- a/spring-js/.classpath
+++ b/spring-js/.classpath
@@ -6,19 +6,19 @@
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-core/tiles-core-2.0.5.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-api/tiles-api-2.0.5.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/tiles-jsp/tiles-jsp-2.0.5.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.3.A/org.springframework.test-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.3.A/org.springframework.core-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/2.5.3.A/org.springframework.web.servlet-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.3.A/org.springframework.context-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/com.springsource.org.apache.tiles.core/2.0.5.osgi/com.springsource.org.apache.tiles.core-2.0.5.osgi.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.3.A/org.springframework.beans-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.3.A/org.springframework.web-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/com.springsource.org.apache.tiles/2.0.5/com.springsource.org.apache.tiles-2.0.5.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/com.springsource.org.apache.tiles.jsp/2.0.5/com.springsource.org.apache.tiles.jsp-2.0.5.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml
index 06f0b43f..e035da9f 100644
--- a/spring-js/ivy.xml
+++ b/spring-js/ivy.xml
@@ -21,24 +21,27 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
-        <dependency org="org.apache.tiles" name="tiles-api" rev="2.0.5" conf="optional->default"/>
-		<dependency org="org.apache.tiles" name="tiles-core" rev="2.0.5" conf="optional->default"/>
-		<dependency org="org.apache.tiles" name="tiles-jsp" rev="2.0.5" conf="optional->default"/>
-		<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
-        <dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
-        <dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/>
-        <dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+        <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.0.5" conf="optional->compile"/>
+        <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.0.5.osgi" conf="optional->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="optional->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.3.A" conf="compile->compile"/>
+        <dependency org="org.springframework" name="org.springframework.beans" rev="2.5.3.A" conf="compile->compile"/>
+        <dependency org="org.springframework" name="org.springframework.web" rev="2.5.3.A" conf="compile->compile"/>
+        <dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.3.A" conf="compile->compile"/>
 
 		<!-- build time only dependencies -->
-		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile" />
     	
 		<!-- test dependencies -->
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="test->compile" />
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile" />
 		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index 81d0be64..db410fb0 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -21,44 +21,50 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="compile->default"/>
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
-		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile, compile->default" />
-		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile, compile->default" />
-		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="compile->default"/>
-		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
-		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
-		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>	
-		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default"/>
+		<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="compile->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="1.3.0" conf="compile, compile->compile" />
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="compile, compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="compile->compile" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.0.4.GA" conf="compile->compile"/>
+		<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="compile->compile"/>	
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile">
+			<exclude org="org.springframework"/>
+		</dependency>
 		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
- 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
 
 		<!-- concurrent Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="edu.oswego.cs.concurrent" name="com.springsource.edu.oswego.cs.dl.util.concurrent" rev="1.3.4" conf="compile->compile"/>
 			
 		<!-- build-time only dependencies -->
-		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
-		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile"/>
+		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet.jsp" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
index b788277f..ee2b12a2 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
@@ -16,7 +16,7 @@
 		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
 		
 		<!-- Override default login and logout pages -->
-		<security:form-login login-page="/spring/login" login-url="/spring/loginProcess" default-target-url="/spring/main" authentication-failure-url="/spring/login?login_error=1" />
+		<security:form-login login-page="/spring/login" login-processing-url="/spring/loginProcess" default-target-url="/spring/main" authentication-failure-url="/spring/login?login_error=1" />
 		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
 	</security:http>
 	
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index c05f8b5e..807bd351 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -21,50 +21,57 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
-		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile->default"/>
-		<dependency org="org.apache.commons" name="commons-beanutils" rev="1.7.0" conf="compile->default" />
-		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
-		<dependency org="org.apache.commons" name="commons-digester" rev="1.8.0" conf="compile->default" />
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="runtime->default"/>
-		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
-		<dependency org="org.apache.tiles" name="tiles-api" rev="2.0.5" conf="compile->default"/>
-		<dependency org="org.apache.tiles" name="tiles-core" rev="2.0.5" conf="compile->default"/>
-		<dependency org="org.apache.tiles" name="tiles-jsp" rev="2.0.5" conf="compile->default"/>
-		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile, compile->default" />
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
-		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
-		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
-		<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2"/>
-		<dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0.0.m2">
-			<!-- exclude org.springframework otherwise spring 2.5.2 will be included -->
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="1.3.0" conf="compile, compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0" conf="compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.digester" rev="1.8.0" conf="compile->compile" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
+		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->compile"/>
+        <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.0.5" conf="compile->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.0.5.osgi" conf="compile->compile"/>
+		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="compile->compile"/>
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="compile, compile->compile" />
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.0.4.GA" conf="compile->compile"/>
+		<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile">
+			<exclude org="org.springframework"/>
+		</dependency>
+		<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.0.A" conf="compile->compile">
 			<exclude org="org.springframework"/>
 		</dependency>
  		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
   		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
 
 		<!-- concurrent Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="edu.oswego.cs.concurrent" name="com.springsource.edu.oswego.cs.dl.util.concurrent" rev="1.3.4" conf="compile->compile"/>
 
 		<!-- build-time only dependencies -->
-		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />	
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile"/>
+		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet.jsp" conf="compile" />
 	</dependencies>
 
 </ivy-module>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
index 23377934..bfb14e2d 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
@@ -16,7 +16,7 @@
 		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
 		
 		<!-- Override default login and logout pages -->
-		<security:form-login login-page="/spring/login" login-url="/spring/loginProcess" default-target-url="/spring/hotels/index" authentication-failure-url="/spring/login?login_error=1" />
+		<security:form-login login-page="/spring/login" login-processing-url="/spring/loginProcess" default-target-url="/spring/hotels/index" authentication-failure-url="/spring/login?login_error=1" />
 		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
 	</security:http>
 	
diff --git a/spring-webflow-samples/booking-portlet-faces/ivy.xml b/spring-webflow-samples/booking-portlet-faces/ivy.xml
index 44bc23a8..a0cd1472 100644
--- a/spring-webflow-samples/booking-portlet-faces/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-faces/ivy.xml
@@ -21,41 +21,44 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="compile->default"/>
-		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
-		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="compile->default"/>
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
+		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
-		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
-		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
-		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile->default"/>
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
-		<dependency	org="javax.el" name="el-api" rev="1.0" conf="compile->default"/>
-		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
-		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile, compile->default" />
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.0.4.GA" conf="compile->compile"/>
+		<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="compile, compile->compile" />
+		<dependency org="edu.oswego.cs.concurrent" name="com.springsource.edu.oswego.cs.dl.util.concurrent" rev="1.3.4" conf="compile->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="1.3.0" conf="compile, compile->compile" />
 
 		<!-- build-time only dependencies -->
-		<dependency	org="javax.portlet" name="portlet-api" rev="1.0" conf="provided->default"/>
-		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
+		<dependency	org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile"/>
+		
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
index 2208c143..1453eafe 100644
--- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
@@ -21,40 +21,43 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="runtime->default"/>
-		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
-		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile->default"/>
-		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
+		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="1.3.0" conf="compile, compile->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="compile->compile" />
 		<dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.3" conf="compile->default"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
-		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
-		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
-		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile->default"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
-		<dependency	org="javax.el" name="el-api" rev="1.0" conf="compile->default"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="edu.oswego.cs.concurrent" name="com.springsource.edu.oswego.cs.dl.util.concurrent" rev="1.3.4" conf="compile->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.0.4.GA" conf="compile->compile"/>
+		<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="compile, compile->compile" />
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
 
 		<!-- build-time only dependencies -->
-		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
-		<dependency	org="javax.portlet" name="portlet-api" rev="1.0" conf="provided->default"/>
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
+		<dependency	org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile"/>
+		
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
diff --git a/spring-webflow-samples/jsf-booking/.classpath b/spring-webflow-samples/jsf-booking/.classpath
index efd17915..586c7ad0 100644
--- a/spring-webflow-samples/jsf-booking/.classpath
+++ b/spring-webflow-samples/jsf-booking/.classpath
@@ -6,192 +6,5 @@
 	<classpathentry 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.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/com.sun.facelets/jsf-facelets/jsf-facelets-1.1.14.jar" sourcepath="IVY_CACHE/com.sun.facelets/jsf-facelets/jsf-facelets-sources-1.1.14.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/edu.oswego.cs/concurrent/concurrent-1.3.4.jar" sourcepath="IVY_CACHE/edu.oswego.cs/concurrent/concurrent-sources-1.3.4.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.persistence/persistence-api/persistence-api-1.0.0.jar" sourcepath="IVY_CACHE/javax.persistence/persistence-api/persistence-api-sources-1.0.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/jstl/jstl-1.1.2.jar" sourcepath="IVY_CACHE/javax.servlet/jstl/jstl-1.1.2-sources.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/javax.transaction/jta/jta-1.1.0.jar" sourcepath="IVY_CACHE/javax.transaction/jta/jta-sources-1.1.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-2.1.3.jar" sourcepath="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-sources-2.1.3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.antlr/antlr/antlr-2.7.6.jar" sourcepath="IVY_CACHE/org.antlr/antlr/antlr-sources-2.7.6.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-1.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-1.7.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-sources-1.7.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-codec/commons-codec-1.3.jar" sourcepath="/IVY_CACHE/org.apache/commons-codec/commons-codec-sources-1.3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-collections/commons-collections-3.2.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-digester/commons-digester-1.8.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-digester/commons-digester-sources-1.8.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-discovery/commons-discovery-0.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-discovery/commons-discovery-sources-0.4.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.myfaces.core/myfaces-api/myfaces-api-1.2.2.jar" sourcepath="IVY_CACHE/org.apache.myfaces.core/myfaces-api/myfaces-api-sources-1.2.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.myfaces.core/myfaces-impl/myfaces-impl-1.2.2.jar" sourcepath="IVY_CACHE/org.apache.myfaces.core/myfaces-impl/myfaces-impl-sources-1.2.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/standard/standard-1.1.2.jar" sourcepath="IVY_CACHE/org.apache.taglibs/standard/standard-sources-1.1.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.dom4j/dom4j/dom4j-1.6.1.jar" sourcepath="IVY_CACHE/org.dom4j/dom4j/dom4j-sources-1.6.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate/hibernate-3.2.5.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate/hibernate-sources-3.2.5.ga.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-commons-annotations/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-commons-annotations/hibernate-commons-annotations-sources-3.3.0.ga.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-annotations/hibernate-annotations-3.3.0.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-annotations/hibernate-annotations-sources-3.3.0.ga.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-entitymanager/hibernate-entitymanager-3.3.1.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-entitymanager/hibernate-entitymanager-sources-3.3.1.ga.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-1.8.0.9.jar" sourcepath="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-sources-1.8.0.9.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss/javassist/javassist-3.3.ga.jar" sourcepath="IVY_CACHE/org.jboss/javassist/javassist-sources-3.3.ga.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss/jboss-common-core/jboss-common-core-2.0.4.GA.jar" sourcepath="IVY_CACHE/org.jboss/jboss-common-core/jboss-common-core-sources-2.0.4.GA.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-aop/spring-aop-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-orm/spring-orm-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-orm/spring-orm-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-tx/spring-tx-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-tx/spring-tx-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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 d7cc52ed..b803eef1 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
@@ -3,7 +3,7 @@
 <wb-module deploy-name="jsf-booking">
 <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib/global"/>
+<wb-resource deploy-path="/WEB-INF/lib" source-path="/target/war-expanded/WEB-INF/lib"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
 <property name="java-output-path" value="target/classes"/>
diff --git a/spring-webflow-samples/jsf-booking/ivy.xml b/spring-webflow-samples/jsf-booking/ivy.xml
index f7dbfec7..30222c43 100644
--- a/spring-webflow-samples/jsf-booking/ivy.xml
+++ b/spring-webflow-samples/jsf-booking/ivy.xml
@@ -21,40 +21,45 @@
 
 	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="compile->default"/>
-		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
-		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="compile->default"/>
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
+		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
+		<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
-		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
-		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
-		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
-		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile->default"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile"/>
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
+		<dependency org="org.jboss.util" name="com.springsource.org.jboss.util" rev="2.0.4.GA" conf="compile->compile"/>
+		<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="compile->compile"/>
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="compile, compile->compile" />
 
 		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
-		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
+		<dependency org="edu.oswego.cs.concurrent" name="com.springsource.edu.oswego.cs.dl.util.concurrent" rev="1.3.4" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
 
 		<!-- build-time only dependencies -->
-		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
-		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile"/>
 
 		<!-- test-time only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile"/>
+		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet" conf="compile" />
+		<exclude org="javax.servlet" module="com.springsource.javax.servlet.jsp" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index 3007630a..384144bc 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -6,39 +6,45 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.persistence/persistence-api/persistence-api-1.0.0.jar" sourcepath="IVY_CACHE/javax.persistence/persistence-api/persistence-api-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/portlet-api/portlet-api-1.0.jar" sourcepath="IVY_CACHE/javax.portlet/portlet-api/portlet-api-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.transaction/jta/jta-1.1.0.jar" sourcepath="IVY_CACHE/javax.transaction/jta/jta-sources-1.1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-2.1.3.jar" sourcepath="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-sources-2.1.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.serp/serp/serp-1.13.1.jar" sourcepath="IVY_CACHE/net.sourceforge.serp/serp/serp-sources-1.13.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-1.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-collections/commons-collections-3.2.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-lang/commons-lang-2.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-lang/commons-lang-sources-2.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/openjpa/openjpa-1.0.2.jar" sourcepath="IVY_CACHE/org.apache.openjpa/openjpa/openjpa-sources-1.0.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.dom4j/dom4j/dom4j-1.6.1.jar" sourcepath="IVY_CACHE/org.dom4j/dom4j/dom4j-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate/hibernate-3.2.5.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate/hibernate-sources-3.2.5.ga.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-1.8.0.9.jar" sourcepath="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-sources-1.8.0.9.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.ognl/ognl/ognl-2.6.9.jar" sourcepath="IVY_CACHE/org.ognl/ognl/ognl-sources-2.6.9.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-aop/spring-aop-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-orm/spring-orm-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-orm/spring-orm-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-tx/spring-tx-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-tx/spring-tx-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-2.5.3.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-sources-2.5.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-2.0.0.m2.jar" sourcepath="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-sources-2.0.0.m2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs/backport-util-concurrent/backport-util-concurrent-3.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar" sourcepath="IVY_CACHE/javax.persistence/persistence-api/persistence-api-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-1.0.0.jar" sourcepath="IVY_CACHE/javax.portlet/portlet-api/portlet-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="IVY_CACHE/javax.transaction/jta/jta-sources-1.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.serp/com.springsource.serp/1.13.1/com.springsource.serp-1.13.1.jar" sourcepath="IVY_CACHE/net.sourceforge.serp/serp/serp-sources-1.13.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.lang/2.1.0/com.springsource.org.apache.commons.lang-2.1.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-lang/commons-lang-sources-2.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa/1.0.2/com.springsource.org.apache.openjpa-1.0.2.jar" sourcepath="IVY_CACHE/org.apache.openjpa/openjpa/openjpa-sources-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.dom4j/com.springsource.org.dom4j/1.6.1/com.springsource.org.dom4j-1.6.1.jar" sourcepath="IVY_CACHE/org.dom4j/dom4j/dom4j-sources-1.6.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate/hibernate-sources-3.2.5.ga.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-sources-1.8.0.9.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.el/com.springsource.org.jboss.el/2.0.0.GA/com.springsource.org.jboss.el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.ognl/com.springsource.org.ognl/2.6.9/com.springsource.org.ognl-2.6.9.jar" sourcepath="IVY_CACHE/org.ognl/ognl/ognl-sources-2.6.9.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.3.A/org.springframework.aop-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.3.A/org.springframework.beans-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.3.A/org.springframework.context-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.3.A/org.springframework.core-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jdbc/2.5.3.A/org.springframework.jdbc-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.orm/2.5.3.A/org.springframework.orm-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-orm/spring-orm-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.3.A/org.springframework.test-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.3.A/org.springframework.transaction-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-tx/spring-tx-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.3.A/org.springframework.web-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/2.5.3.A/org.springframework.web.servlet-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.portlet/2.5.3.A/org.springframework.web.portlet-2.5.3.A.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-sources-2.5.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security/2.0.0.A/org.springframework.security-2.0.0.A.jar" sourcepath="IVY_CACHE/org.springframework.security/spring-security-core/spring-security-core-sources-2.0.0.m2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-js"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.java5/1.0.2/com.springsource.org.apache.openjpa.java5-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.jdbc/1.0.2/com.springsource.org.apache.openjpa.jdbc-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib/1.0.2/com.springsource.org.apache.openjpa.lib-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib.java5/1.0.2/com.springsource.org.apache.openjpa.lib.java5-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence/1.0.2/com.springsource.org.apache.openjpa.persistence-1.0.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence.jdbc/1.0.2/com.springsource.org.apache.openjpa.persistence.jdbc-1.0.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 9468080d..3684b43c 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -21,45 +21,53 @@
 
 	<dependencies>
 		<!--  global (core) dependencies -->
-		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-beans" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-core" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-context" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-web" rev="2.5.3" conf="compile->default"/>
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.3" conf="compile->default"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.3.A" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.3.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
         <dependency org="org.springframework.webflow" name="spring-js" rev="latest.integration" conf="compile->compile"/>
 
 		<!-- testing support only dependencies -->
-		<dependency org="org.junit" name="junit" rev="3.8.2" conf="compile, test->default" />
+		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="compile, test->compile" />
 
 		<!-- build time only dependencies -->		
-		<dependency org="edu.emory.mathcs" name="backport-util-concurrent" rev="3.0.0" conf="optional->default" />
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="provided->default" />
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default" />
-		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="provided->default" />
-		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default" />
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="optional, test->default" />
-		<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="optional->default" />
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.3" conf="optional->default" />
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.3" conf="optional->default" />
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.3" conf="optional->default" />
-		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="optional->default" />
+		<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional->compile" />
+		<dependency org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->compile" />
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->compile" />
+		<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile" />
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile" />
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="optional, test->compile" />
+		<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="optional->compile" />
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.3.A" conf="optional->compile" />
+		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.3.A" conf="optional->compile" />
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.3.A" conf="optional->compile" />
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="optional->compile" />
 	
 		<!-- test time only dependencies -->
-		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="test->default"/>
-		<dependency org="net.sourceforge.serp" name="serp" rev="1.13.1" conf="test->default" />
-		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
-		<dependency org="org.apache.commons" name="commons-lang" rev="2.1" conf="test->default" />
-		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="test->default" />
-		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
-		<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default"/>
-		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="test->default" />
-		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-aop" rev="2.5.3" conf="test->default" />		
-		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.3" conf="test->default" />
-		<dependency org="org.springframework" name="spring-test" rev="2.5.3" conf="test->default" />
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->compile"/>
+		<dependency org="net.sourceforge.serp" name="com.springsource.serp" rev="1.13.1" conf="test->compile" />
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="test->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.1.0" conf="test->compile" />
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="test->compile" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->compile" />
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa" rev="1.0.2" conf="test->compile"/>
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.java5" rev="1.0.2" conf="test->compile"/>
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.lib.java5" rev="1.0.2" conf="test->compile"/>
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence" rev="1.0.2" conf="test->compile"/>
+		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa.persistence.jdbc" rev="1.0.2" conf="test->compile"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile" />
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile" />
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.3.A" conf="test->compile" />		
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.3.A" conf="test->compile" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.3.A" conf="test->compile" />
+		
+		<exclude org="javax.el" conf="compile" />
+		<exclude org="javax.portlet" conf="compile" />
+		<exclude org="javax.servlet" conf="compile" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file