Author: mrdon
Date: Sun May 7 09:51:48 2006
New Revision: 404794
URL: http://svn.apache.org/viewcvs?rev=404794&view=rev
Log:
Completing move from thirdparty to extras, consolidated sources into one module
Added:
incubator/webwork2/extras/src/
- copied from r404792, incubator/webwork2/extras/jasperreports/src/
incubator/webwork2/extras/src/main/java/org/apache/struts/action2/dispatcher/
- copied from r404792,
incubator/webwork2/extras/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/
incubator/webwork2/extras/src/main/java/org/apache/struts/action2/dispatcher/multipart/
- copied from r404792,
incubator/webwork2/extras/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/
incubator/webwork2/extras/src/test/java/org/
- copied from r404792,
incubator/webwork2/extras/jfreechart/src/test/java/org/
Removed:
incubator/webwork2/extras/jasperreports/
incubator/webwork2/extras/jfreechart/
incubator/webwork2/extras/pell-file-upload/
Modified:
incubator/webwork2/apps/showcase/pom.xml
incubator/webwork2/build.xml
incubator/webwork2/extras/pom.xml
Modified: incubator/webwork2/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/showcase/pom.xml?rev=404794&r1=404793&r2=404794&view=diff
==============================================================================
--- incubator/webwork2/apps/showcase/pom.xml (original)
+++ incubator/webwork2/apps/showcase/pom.xml Sun May 7 09:51:48 2006
@@ -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>
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=404794&r1=404793&r2=404794&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Sun May 7 09:51:48 2006
@@ -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>
Modified: incubator/webwork2/extras/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/extras/pom.xml?rev=404794&r1=404793&r2=404794&view=diff
==============================================================================
--- incubator/webwork2/extras/pom.xml (original)
+++ incubator/webwork2/extras/pom.xml Sun May 7 09:51:48 2006
@@ -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>
