Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Completing move from thirdparty to extras, consolidated sources into one module

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@404794 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-05-07 16:51:48 +00:00
parent b967d99fcb
commit 64c4cd4ec3
14 changed files with 55 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/pom.xml
+1 -1
View File
@@ -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>
build.xml
+1 -3
View File
@@ -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>
extras/jasperreports/pom.xml
-43
View File
@@ -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>
extras/jfreechart/pom.xml
-56
View File
@@ -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>
extras/pell-file-upload/pom.xml
-45
View File
@@ -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>
extras/pom.xml
+53 -9
View File
@@ -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>
extras/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java → extras/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
View File
extras/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java → extras/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
View File
extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java → extras/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
View File
extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java → extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
View File
extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java → extras/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
View File
extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java → extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
View File
extras/jasperreports/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java → extras/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
View File
extras/jfreechart/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java → extras/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
View File