Index: service/pom.xml
===================================================================
--- service/pom.xml	(revision 3038)
+++ service/pom.xml	(working copy)
@@ -192,21 +192,31 @@
             <groupId>org.codehaus.xfire</groupId>
             <artifactId>xfire-spring</artifactId>
             <version>${xfire.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <version>${spring.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
+                    <artifactId>spring</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-remoting</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
     </dependencies>
 </project>
Index: data/hibernate/pom.xml
===================================================================
--- data/hibernate/pom.xml	(revision 3038)
+++ data/hibernate/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-data</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-hibernate</artifactId>
Index: data/common/pom.xml
===================================================================
--- data/common/pom.xml	(revision 3038)
+++ data/common/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-data</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-data-common</artifactId>
Index: data/jpa/pom.xml
===================================================================
--- data/jpa/pom.xml	(revision 3038)
+++ data/jpa/pom.xml	(working copy)
@@ -4,9 +4,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-data</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-jpa</artifactId>
Index: data/pom.xml
===================================================================
--- data/pom.xml	(revision 3038)
+++ data/pom.xml	(working copy)
@@ -44,5 +44,18 @@
         <module>ibatis</module>
         <module>jpa</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+    </dependencies>
 </project>
 
Index: data/ibatis/pom.xml
===================================================================
--- data/ibatis/pom.xml	(revision 3038)
+++ data/ibatis/pom.xml	(working copy)
@@ -22,9 +22,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-data</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     
     <artifactId>appfuse-ibatis</artifactId>
Index: pom.xml
===================================================================
--- pom.xml	(revision 3038)
+++ pom.xml	(working copy)
@@ -257,6 +257,10 @@
             <id>appfuse</id>
             <url>http://static.appfuse.org/repository</url>
         </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -279,14 +283,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
                     <artifactId>spring-dao</artifactId>
                 </exclusion>
                 <exclusion>
@@ -318,39 +314,11 @@
             <groupId>${jdbc.groupId}</groupId>
             <artifactId>${jdbc.artifactId}</artifactId>
             <version>${jdbc.version}</version>
-        </dependency>
+        </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
+            <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
-            <!-- commons-logging 1.1. has invalid dependencies -->
-            <exclusions>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>${spring.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
@@ -547,7 +515,7 @@
         <servlet.version>2.4</servlet.version>
         <shale.version>1.0.4</shale.version>
         <sitemesh.version>2.2.1</sitemesh.version>
-        <spring.version>2.0.7</spring.version>
+        <spring.version>2.5-rc1</spring.version>
         <springmodules.validation.version>0.8</springmodules.validation.version>
         <struts.version>2.0.11</struts.version>
         <struts.menu.version>2.4.3</struts.menu.version>
Index: web/jsf/pom.xml
===================================================================
--- web/jsf/pom.xml	(revision 3038)
+++ web/jsf/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-web</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-jsf</artifactId>
Index: web/spring/src/main/webapp/WEB-INF/pages/uploadForm.jsp
===================================================================
--- web/spring/src/main/webapp/WEB-INF/pages/uploadForm.jsp	(revision 3038)
+++ web/spring/src/main/webapp/WEB-INF/pages/uploadForm.jsp	(working copy)
@@ -38,9 +38,7 @@
     <li>
         <appfuse:label key="uploadForm.file" styleClass="desc"/>
         <form:errors path="file" cssClass="fieldError"/>
-        <spring:bind path="fileUpload.file">
-        <input type="file" name="file" id="file" class="file medium" value="<c:out value="${status.value}"/>"/>
-        </spring:bind>
+        <input type="file" name="file" id="file" class="file medium"/>
     </li>
     <li class="buttonBar bottom">
         <input type="submit" name="upload" class="button" onclick="bCancel=false"
Index: web/spring/pom.xml
===================================================================
--- web/spring/pom.xml	(revision 3038)
+++ web/spring/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-web</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-spring</artifactId>
@@ -159,23 +158,16 @@
             <version>${displaytag.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
-            <version>${wiser.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Dependencies with scope=provided aren't picked up from dependent JARs -->
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
             <version>${jsp.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet.version}</version>
-            <scope>provided</scope>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp-wiser</artifactId>
+            <version>${wiser.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springmodules</groupId>
@@ -183,16 +175,19 @@
             <version>${springmodules.validation.version}</version>
             <exclusions>
                 <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-support</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>${jdbc.groupId}</groupId>
-            <artifactId>${jdbc.artifactId}</artifactId>
-            <version>${jdbc.version}</version>
-        </dependency>
     </dependencies>
 
     <profiles>
Index: web/struts/pom.xml
===================================================================
--- web/struts/pom.xml	(revision 3038)
+++ web/struts/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-web</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-struts</artifactId>
@@ -194,6 +193,17 @@
             <type>warpath</type>
         </dependency>
         <dependency>
+            <groupId>displaytag</groupId>
+            <artifactId>displaytag</artifactId>
+            <version>${displaytag.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>${jsp.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
             <version>${struts.version}</version>
@@ -207,24 +217,6 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
             <version>${struts.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -242,35 +234,6 @@
             <artifactId>commons-io</artifactId>
             <version>${commons.io.version}</version>
         </dependency>
-        <dependency>
-            <groupId>displaytag</groupId>
-            <artifactId>displaytag</artifactId>
-            <version>${displaytag.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
-            <version>${wiser.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Dependencies with scope=provided aren't picked up from dependent JARs -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>${jsp.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${jdbc.groupId}</groupId>
-            <artifactId>${jdbc.artifactId}</artifactId>
-            <version>${jdbc.version}</version>
-        </dependency>
     </dependencies>
 
     <profiles>
Index: web/common/pom.xml
===================================================================
--- web/common/pom.xml	(revision 3038)
+++ web/common/pom.xml	(working copy)
@@ -4,9 +4,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-web</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-web-common</artifactId>
@@ -141,92 +140,4 @@
             </testResource>
         </testResources>
     </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>appfuse-service</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>${commons.dbcp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
-            <version>${wiser.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-            <version>${dwr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>${jsp.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${jdbc.groupId}</groupId>
-            <artifactId>${jdbc.artifactId}</artifactId>
-            <version>${jdbc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>struts-menu</groupId>
-            <artifactId>struts-menu</artifactId>
-            <version>${struts.menu.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>clickstream</artifactId>
-            <version>${clickstream.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>oscache</artifactId>
-            <version>${oscache.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>sitemesh</artifactId>
-            <version>${sitemesh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.tuckey</groupId>
-            <artifactId>urlrewritefilter</artifactId>
-            <version>${urlrewrite.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file
Index: web/pom.xml
===================================================================
--- web/pom.xml	(revision 3038)
+++ web/pom.xml	(working copy)
@@ -45,4 +45,98 @@
         <module>struts</module>
         <module>tapestry</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>appfuse-service</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>${commons.dbcp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp-wiser</artifactId>
+            <version>${wiser.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
+            <version>${dwr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>${servlet.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>${jstl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${jdbc.groupId}</groupId>
+            <artifactId>${jdbc.artifactId}</artifactId>
+            <version>${jdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>struts-menu</groupId>
+            <artifactId>struts-menu</artifactId>
+            <version>${struts.menu.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>clickstream</artifactId>
+            <version>${clickstream.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>oscache</artifactId>
+            <version>${oscache.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>${sitemesh.version}</version>
+        </dependency>
+        <!-- For some reason, spring-aop isn't picked up from appfuse-service -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <!-- Needed to load xfire-servlet.xml for all web frameworks -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.tuckey</groupId>
+            <artifactId>urlrewritefilter</artifactId>
+            <version>${urlrewrite.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
Index: web/tapestry/pom.xml
===================================================================
--- web/tapestry/pom.xml	(revision 3038)
+++ web/tapestry/pom.xml	(working copy)
@@ -20,9 +20,8 @@
 
     <parent>
         <groupId>org.appfuse</groupId>
-        <artifactId>appfuse</artifactId>
+        <artifactId>appfuse-web</artifactId>
         <version>2.0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>appfuse-tapestry</artifactId>
@@ -202,30 +201,6 @@
             <artifactId>tacos-core</artifactId>
             <version>${tacos.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
-            <version>${wiser.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Dependencies with scope=provided aren't picked up from dependent JARs -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>${jsp.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${jdbc.groupId}</groupId>
-            <artifactId>${jdbc.artifactId}</artifactId>
-            <version>${jdbc.version}</version>
-        </dependency>
     </dependencies>
 
     <profiles>