diff --git a/action/pom.xml b/action/pom.xml
index 84b099a61..edf31a930 100644
--- a/action/pom.xml
+++ b/action/pom.xml
@@ -12,91 +12,6 @@
     <artifactId>action</artifactId>
     <packaging>jar</packaging>
     <name>Struts Action Framework 2.0</name>
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
-    </scm>
-    <profiles>
-        <profile>
-            <activation>
-                <jdk>1.4</jdk>
-            </activation>
-            <dependencies>
-                <!-- should have the org.w3c.dom dependency here -->
-            </dependencies>
-        </profile>
-    </profiles>
-    <repositories>
-     	<repository>
-            <id>snapshots-maven-codehaus</id>
-            <name>snapshots-maven-codehaus</name>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <url>http://snapshots.maven.codehaus.org/maven2</url>
-        </repository>
-        <repository>
-            <id>opensymphony</id>
-            <name>opensymphony</name>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <url>http://maven.opensymphony.com</url>
-        </repository>
-    </repositories>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/TestBean.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <!-- unreferenced dependencies:
              * clover, mockobjects, xdoclet : only needed for build
diff --git a/pom.xml b/pom.xml
index d1a3a4daf..cacd951b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,107 @@
         <module>action</module>
         <module>webapps</module>
     </modules>
+    <repositories>
+     	<repository>
+            <id>snapshots-maven-codehaus</id>
+            <name>snapshots-maven-codehaus</name>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://snapshots.maven.codehaus.org/maven2</url>
+        </repository>
+        <repository>
+            <id>apache</id>
+            <name>apache</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://cvs.apache.org/repository</url>
+        </repository>
+        <repository>
+            <id>opensymphony</id>
+            <name>opensymphony</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://maven.opensymphony.com</url>
+        </repository>
+    </repositories>
+    <profiles>
+        <profile>
+            <id>thirdparty</id>
+            <modules>
+                <module>thirdparty</module>
+                <module>uber</module>
+            </modules>
+        </profile>
+        <profile>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <!-- should have the org.w3c.dom dependency here -->
+            </dependencies>
+        </profile>
+    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/TestBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
         <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
diff --git a/thirdparty/jasperreports/pom.xml b/thirdparty/jasperreports/pom.xml
new file mode 100644
index 000000000..40b126cde
--- /dev/null
+++ b/thirdparty/jasperreports/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>thirdparty</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>action-jasperreports</artifactId>
+    <packaging>jar</packaging>
+    <name>JasperReports</name>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
+    </scm>
+    <profiles>
+        <profile>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <!-- should have the org.w3c.dom dependency here -->
+            </dependencies>
+        </profile>
+    </profiles>
+    <repositories>
+        <repository>
+            <id>opensymphony</id>
+            <name>opensymphony</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://maven.opensymphony.com</url>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/TestBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/action/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
similarity index 91%
rename from action/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
rename to thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
index 4f71c679d..8a4f781b0 100644
--- a/action/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
+++ b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: CompileReport.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
@@ -24,7 +24,7 @@ import net.sf.jasperreports.engine.JasperCompileManager;
  * Ported to Struts:
  *
  * @author &lt;a href="hermanns@aixcept.de"&gt;Rainer Hermanns&lt;/a&gt;
- * @version $Id$
+ * @version $Id: CompileReport.java 392647 2006-04-09 00:41:12Z plightbo $
  */
 public class CompileReport {
 
diff --git a/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
similarity index 89%
rename from action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
rename to thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
index 674a1ee83..b19a2a861 100644
--- a/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
+++ b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: JasperReportConstants.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
@@ -22,7 +22,7 @@ package org.apache.struts.action2.views.jasperreports;
  * <code>JasperReportConstants</code>
  *
  * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
+ * @version $Id: JasperReportConstants.java 392647 2006-04-09 00:41:12Z plightbo $
  */
 public interface JasperReportConstants {
 
diff --git a/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
similarity index 99%
rename from action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
rename to thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
index b38f1ff9e..dbb85ac51 100644
--- a/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
+++ b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: JasperReportsResult.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
similarity index 96%
rename from action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
rename to thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
index 24bef7399..bec1739f7 100644
--- a/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
+++ b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: OgnlValueStackDataSource.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
@@ -31,7 +31,7 @@ import java.util.Iterator;
  * Ported to Struts.
  *
  * @author &lt;a href="hermanns@aixcept.de"&gt;Rainer Hermanns&lt;/a&gt;
- * @version $Id$
+ * @version $Id: OgnlValueStackDataSource.java 392647 2006-04-09 00:41:12Z plightbo $
  */
 public class OgnlValueStackDataSource implements JRDataSource {
 
diff --git a/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
similarity index 93%
rename from action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
rename to thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
index e1e7fd9c3..d8bb4313f 100644
--- a/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
+++ b/thirdparty/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: OgnlValueStackShadowMap.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
@@ -27,7 +27,7 @@ import java.util.Set;
  * Ported to Struts:
  *
  * @author &lt;a href="hermanns@aixcept.de"&gt;Rainer Hermanns&lt;/a&gt;
- * @version $Id$
+ * @version $Id: OgnlValueStackShadowMap.java 392647 2006-04-09 00:41:12Z plightbo $
  */
 public class OgnlValueStackShadowMap extends HashMap {
 
diff --git a/thirdparty/jfreechart/pom.xml b/thirdparty/jfreechart/pom.xml
new file mode 100644
index 000000000..93c7f4a41
--- /dev/null
+++ b/thirdparty/jfreechart/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>thirdparty</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>action-jfreechart</artifactId>
+    <packaging>jar</packaging>
+    <name>JFree Chart</name>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
+    </scm>
+    <profiles>
+        <profile>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <!-- should have the org.w3c.dom dependency here -->
+            </dependencies>
+        </profile>
+    </profiles>
+    <repositories>
+        <repository>
+            <id>opensymphony</id>
+            <name>opensymphony</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://maven.opensymphony.com</url>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/TestBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+            <version>1.0.0</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>gnujaxp</groupId>
+                    <artifactId>gnujaxp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-core</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java b/thirdparty/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
similarity index 97%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
rename to thirdparty/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
index 4a02623e2..7d9ad51b9 100644
--- a/action/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
+++ b/thirdparty/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: ChartResult.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java b/thirdparty/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
similarity index 98%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
rename to thirdparty/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
index d52693085..31893beb1 100644
--- a/action/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
+++ b/thirdparty/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: ChartResultTest.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/thirdparty/pell-file-upload/pom.xml b/thirdparty/pell-file-upload/pom.xml
new file mode 100644
index 000000000..14ae15f65
--- /dev/null
+++ b/thirdparty/pell-file-upload/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>thirdparty</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>action-pell-file-upload</artifactId>
+    <packaging>jar</packaging>
+    <name>Pell File Upload</name>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
+    </scm>
+    <profiles>
+        <profile>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <!-- should have the org.w3c.dom dependency here -->
+            </dependencies>
+        </profile>
+    </profiles>
+    <repositories>
+        <repository>
+            <id>opensymphony</id>
+            <name>opensymphony</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://maven.opensymphony.com</url>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/TestBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>pell-multipart</artifactId>
+            <!-- webwork's ivy dependency reports mentions v1.19 ? -->
+            <version>2.1.5</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>       
+    </dependencies>
+</project>
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java b/thirdparty/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
similarity index 98%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
rename to thirdparty/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
index 8079c497e..5d90d7e22 100644
--- a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
+++ b/thirdparty/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: PellMultiPartRequest.java 392647 2006-04-09 00:41:12Z plightbo $
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
new file mode 100644
index 000000000..f80889658
--- /dev/null
+++ b/thirdparty/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts.action2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>thirdparty</artifactId>
+    <packaging>pom</packaging>
+    <name>Third Party Modules</name>
+    <modules>
+        <module>jasperreports</module>
+        <module>jfreechart</module>
+        <module>pell-file-upload</module>
+    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/uber/pom.xml b/uber/pom.xml
new file mode 100644
index 000000000..792d5f2c3
--- /dev/null
+++ b/uber/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts.action2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>action-all</artifactId>
+    <packaging>pom</packaging>
+    <name>Uber Jar</name>
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <configuration>
+            <descriptor>src/assemble/main.xml</descriptor>
+          </configuration>
+          <!-- Note: We need to turn this off because of http://jira.codehaus.org/browse/MNG-1684 -->
+          <!--
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>attached</goal>
+              </goals>
+            </execution>
+          </executions>
+          -->
+        </plugin>
+      </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <version>2.0-SNAPSHOT</version>
+            <artifactId>action-jasperreports</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <version>2.0-SNAPSHOT</version>
+            <artifactId>action-jfreechart</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <version>2.0-SNAPSHOT</version>
+            <artifactId>action-pell-file-upload</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/uber/src/assemble/main.xml b/uber/src/assemble/main.xml
new file mode 100644
index 000000000..8da17181b
--- /dev/null
+++ b/uber/src/assemble/main.xml
@@ -0,0 +1,19 @@
+<assembly>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+          <include>org.apache.struts.action2:action</include>
+          <include>org.apache.struts.action2:action-jasperreports</include>
+          <include>org.apache.struts.action2:action-jfreechart</include>
+          <include>org.apache.struts.action2:action-pell-file-upload</include>
+      </includes>
+      <unpack>true</unpack>
+      <scope>test</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/webapps/blank/pom.xml b/webapps/blank/pom.xml
index 67efda685..18d3bc610 100644
--- a/webapps/blank/pom.xml
+++ b/webapps/blank/pom.xml
@@ -12,41 +12,6 @@
     <artifactId>webapp-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/webapps/pom.xml b/webapps/pom.xml
index 4b6077e67..264492f7f 100644
--- a/webapps/pom.xml
+++ b/webapps/pom.xml
@@ -19,4 +19,18 @@
         <module>showcase</module>
         <module>starter</module>
     </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/webapps/portlet/pom.xml b/webapps/portlet/pom.xml
index edde6afac..a7bcfb767 100644
--- a/webapps/portlet/pom.xml
+++ b/webapps/portlet/pom.xml
@@ -12,50 +12,7 @@
     <artifactId>webapp-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portet Webapp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>portlet-api</groupId>
             <artifactId>portlet-api</artifactId>
diff --git a/webapps/shopping-cart/pom.xml b/webapps/shopping-cart/pom.xml
index de1a4872a..a1c0c88b7 100644
--- a/webapps/shopping-cart/pom.xml
+++ b/webapps/shopping-cart/pom.xml
@@ -12,41 +12,6 @@
     <artifactId>webapp-shopping-cart</artifactId>
     <packaging>war</packaging>
     <name>Shopping Cart Webapp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/webapps/showcase/pom.xml b/webapps/showcase/pom.xml
index 6b670e80e..805e6f32a 100644
--- a/webapps/showcase/pom.xml
+++ b/webapps/showcase/pom.xml
@@ -12,50 +12,7 @@
     <artifactId>webapp-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/webapps/starter/pom.xml b/webapps/starter/pom.xml
index b28344f73..b86c943c1 100644
--- a/webapps/starter/pom.xml
+++ b/webapps/starter/pom.xml
@@ -12,41 +12,6 @@
     <artifactId>webapp-starter</artifactId>
     <packaging>war</packaging>
     <name>Starter Webapp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.4</jdkName>
-                    <exclude>target,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>