diff --git a/spring-faces/.classpath b/spring-faces/.classpath
index 2227b115..e279d13c 100644
--- a/spring-faces/.classpath
+++ b/spring-faces/.classpath
@@ -5,27 +5,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="lib" path="lib/buildtime/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-codec.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-digester.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-discovery.jar"/>
-	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/myfaces-api.jar" sourcepath="/Users/jgrelle/Desktop/myfaces-api-1.2.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/myfaces-impl.jar" sourcepath="/Users/jgrelle/Desktop/myfaces-impl-1.2.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit.jar"/>
-	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/richfaces-api.jar"/>
-	<classpathentry kind="lib" path="lib/test/shale-test.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-web.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-webmvc.jar"/>
-	<classpathentry kind="lib" path="lib/test/spring-test.jar"/>
+	<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-codec/commons-codec-1.3.jar" sourcepath="/IVY_CACHE/org.apache/commons-codec/commons-codec-sources-1.3.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.commons/commons-discovery/commons-discovery-0.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-discovery/commons-discovery-sources-0.4.0.jar"/>
+	<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"/>
+	<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"/>
+	<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.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-reference/.classpath b/spring-webflow-reference/.classpath
deleted file mode 100644
index db9d1cd5..00000000
--- a/spring-webflow-reference/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<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/org.junit/junit/junit-4.4.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-4.4.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spring-webflow-reference/.project b/spring-webflow-reference/.project
index 46458044..41e5191a 100644
--- a/spring-webflow-reference/.project
+++ b/spring-webflow-reference/.project
@@ -5,13 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/spring-webflow-reference/ivy.xml b/spring-webflow-reference/ivy.xml
deleted file mode 100644
index a796877a..00000000
--- a/spring-webflow-reference/ivy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
-		version="1.3">
-
-	<info organisation="spring-webflow-reference" module="${ant.project.name}">
-		<ivyauthor name="sweeney"/>
-	</info>
-
-	<configurations>
-		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
-	</configurations>
-
-	<publications>
-		<artifact name="${ant.project.name}"/>
-		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
-	</publications>
-
-	<dependencies>
-		<dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index ac4b0064..ce9d105f 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -4,43 +4,38 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spring-binding"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/test/aopalliance.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/asm.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/cglib.jar"/>
-	<classpathentry kind="lib" path="lib/test/clover.jar"/>
-	<classpathentry kind="lib" path="lib/test/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/test/commons-lang.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/concurrent.jar"/>
-	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/dom4j.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/ehcache.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/hibernate.jar"/>
-	<classpathentry kind="lib" path="lib/test/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/jta.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/junit.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/ognl.jar"/>
-	<classpathentry kind="lib" path="lib/test/openjpa.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/portlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/test/serp.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/test/spring-aop.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="/spring"/>
-	<classpathentry kind="lib" path="lib/test/spring-jdbc.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/spring-orm.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/spring-security-core.jar"/>
-	<classpathentry kind="lib" path="lib/test/spring-test.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/spring-tx.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-web.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/spring-webmvc.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/spring-webmvc-portlet.jar"/>
+	<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"/>
+	<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-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.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.2.jar"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<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"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc/spring-webmvc-sources-2.5.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-webmvc-portlet/spring-webmvc-portlet-sources-2.5.2.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="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index a5adc9d6..5eff78a4 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -59,17 +59,7 @@
 		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="test->default" />
 		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile, test->default" />
-		<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default">
-			<!-- Exclusions required because open jpa pom is poorly designed -->
-			<exclude module="openjpa-lib" />
-			<exclude module="openjpa-kernel" />
-			<exclude module="openjpa-kernel-5" />
-			<exclude module="openjpa-jdbc" />
-			<exclude module="openjpa-jdbc-5" />
-			<exclude module="openjpa-persistence" />
-			<exclude module="openjpa-persistence-jdbc" />
-			<exclude module="openjpa-xmlstore" />
-		</dependency>
+		<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default"/>
 		<!-- lang and serp are required by open jpa -->
 		<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" />