From 64c4cd4ec3d3b5b1d8b009a5cdd779385d8a1812 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Sun, 7 May 2006 16:51:48 +0000
Subject: [PATCH] Completing move from thirdparty to extras, consolidated
 sources into one module

git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@404794 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/pom.xml                         |  2 +-
 build.xml                                     |  4 +-
 extras/jasperreports/pom.xml                  | 43 -------------
 extras/jfreechart/pom.xml                     | 56 -----------------
 extras/pell-file-upload/pom.xml               | 45 --------------
 extras/pom.xml                                | 62 ++++++++++++++++---
 .../action2/dispatcher/ChartResult.java       |  0
 .../multipart/PellMultiPartRequest.java       |  0
 .../views/jasperreports/CompileReport.java    |  0
 .../jasperreports/JasperReportConstants.java  |  0
 .../jasperreports/JasperReportsResult.java    |  0
 .../OgnlValueStackDataSource.java             |  0
 .../OgnlValueStackShadowMap.java              |  0
 .../action2/dispatcher/ChartResultTest.java   |  0
 14 files changed, 55 insertions(+), 157 deletions(-)
 delete mode 100644 extras/jasperreports/pom.xml
 delete mode 100644 extras/jfreechart/pom.xml
 delete mode 100644 extras/pell-file-upload/pom.xml
 rename extras/{jfreechart => }/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java (100%)
 rename extras/{pell-file-upload => }/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java (100%)
 rename extras/{jasperreports => }/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java (100%)
 rename extras/{jasperreports => }/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java (100%)
 rename extras/{jasperreports => }/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java (100%)
 rename extras/{jasperreports => }/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java (100%)
 rename extras/{jasperreports => }/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java (100%)
 rename extras/{jfreechart => }/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java (100%)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 52ea7c376..1ac2fd1aa 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.struts.action2</groupId>
-            <artifactId>struts-jasperreports</artifactId>
+            <artifactId>struts-extras</artifactId>
             <version>${pom.version}</version>
         </dependency>
         
diff --git a/build.xml b/build.xml
index 2ece0e24a..6d10d8e27 100644
--- a/build.xml
+++ b/build.xml
@@ -240,9 +240,7 @@
     </target>
 
     <target name="compile-optional" depends="compile, init-optional" description="compile optional files">
-        <compile srcdir="thirdparty/jasperreports/src/main/java" destdir="${build.java}"  />
-        <compile srcdir="thirdparty/pell-file-upload/src/main/java" destdir="${build.java}"  />
-        <compile srcdir="thirdparty/jfreechart/src/main/java" destdir="${build.java}"  />
+        <compile srcdir="extras/src/main/java" destdir="${build.java}"  />
     </target>
 
 </project>
diff --git a/extras/jasperreports/pom.xml b/extras/jasperreports/pom.xml
deleted file mode 100644
index a72132607..000000000
--- a/extras/jasperreports/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <artifactId>struts-jasperreports</artifactId>
-    <packaging>jar</packaging>
-    <name>JasperReports</name>
-    
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/jasperreports</url>
-        </site>
-    </distributionManagement>
-    
-    <dependencies>
-    
-        <dependency>
-           <groupId>javax.servlet</groupId>
-           <artifactId>servlet-api</artifactId>
-           <version>2.4</version>
-           <scope>provided</scope>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-      
-        <dependency>
-            <groupId>jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/extras/jfreechart/pom.xml b/extras/jfreechart/pom.xml
deleted file mode 100644
index 5440f6cbe..000000000
--- a/extras/jfreechart/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>
-    <artifactId>struts-jfreechart</artifactId>
-    <packaging>jar</packaging>
-    <name>JFreeChart</name>
-    
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/jfreechart</url>
-        </site>
-    </distributionManagement>
-    
-    <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>org.apache.struts.action2</groupId>
-            <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/extras/pell-file-upload/pom.xml b/extras/pell-file-upload/pom.xml
deleted file mode 100644
index 1886b7600..000000000
--- a/extras/pell-file-upload/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>
-    <artifactId>struts-pell-file-upload</artifactId>
-    <packaging>jar</packaging>
-    <name>Pell File Upload</name>
-    
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/pell-file-upload</url>
-        </site>
-    </distributionManagement>
-    
-    <dependencies>
-    
-      
-        <dependency>
-           <groupId>javax.servlet</groupId>
-           <artifactId>servlet-api</artifactId>
-           <version>2.4</version>
-           <scope>provided</scope>
-        </dependency>
-      
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>pell-multipart</artifactId>
-            <version>2.1.5</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>    
-    </dependencies>
-</project>
diff --git a/extras/pom.xml b/extras/pom.xml
index 90f6f7a24..825569092 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -8,20 +8,64 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>thirdparty</artifactId>
-    <packaging>pom</packaging>
-    <name>Third Party Modules</name>
+    <artifactId>struts-extras</artifactId>
+    <packaging>jar</packaging>
+    <name>Struts Extras</name>
     
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/struts-extras</url>
         </site>
     </distributionManagement>
     
-    <modules>
-        <module>jasperreports</module>
-        <module>jfreechart</module>
-        <module>pell-file-upload</module>
-    </modules>
+    <dependencies>
+    
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+      
+        <dependency>
+            <groupId>jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-core</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <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>opensymphony</groupId>
+            <artifactId>pell-multipart</artifactId>
+            <version>2.1.5</version>
+            <optional>true</optional>
+        </dependency>
+        
+    </dependencies>
 </project>
diff --git a/extras/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java b/extras/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
similarity index 100%
rename from extras/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
rename to extras/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
diff --git a/extras/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java b/extras/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
similarity index 100%
rename from extras/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
rename to extras/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
diff --git a/extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java b/extras/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
similarity index 100%
rename from extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
rename to extras/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
diff --git a/extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java b/extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
similarity index 100%
rename from extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
rename to extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
diff --git a/extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java b/extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
similarity index 100%
rename from extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
rename to extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
diff --git a/extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java b/extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
similarity index 100%
rename from extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
rename to extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
diff --git a/extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java b/extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
similarity index 100%
rename from extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
rename to extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
diff --git a/extras/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java b/extras/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
similarity index 100%
rename from extras/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
rename to extras/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java