You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/05/07 04:32:28 UTC
svn commit: r400385 - in /incubator/webwork2: ./ action/ core/
core/src/test/java/org/apache/struts/action2/views/jsp/ src/site/
thirdparty/ thirdparty/jasperreports/ thirdparty/jfreechart/
thirdparty/pell-file-upload/ webapps/ webapps/blank/ webapps/p...
Author: mrdon
Date: Sat May 6 19:32:25 2006
New Revision: 400385
URL: http://svn.apache.org/viewcvs?rev=400385&view=rev
Log:
Starting to synchronizing the Maven 2 build with Struts Action 1,
keeping the Ant build in sync
Added:
incubator/webwork2/core/
- copied from r400381, incubator/webwork2/action/
Removed:
incubator/webwork2/action/
Modified:
incubator/webwork2/build.properties
incubator/webwork2/core/pom.xml
incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
incubator/webwork2/osbuild.xml
incubator/webwork2/pom.xml
incubator/webwork2/src/site/site.xml
incubator/webwork2/thirdparty/jasperreports/pom.xml
incubator/webwork2/thirdparty/jfreechart/pom.xml
incubator/webwork2/thirdparty/pell-file-upload/pom.xml
incubator/webwork2/thirdparty/pom.xml
incubator/webwork2/webapps/blank/pom.xml
incubator/webwork2/webapps/pom.xml
incubator/webwork2/webapps/portlet/pom.xml
incubator/webwork2/webapps/shopping-cart/pom.xml
incubator/webwork2/webapps/showcase/pom.xml
incubator/webwork2/webapps/starter/pom.xml
Modified: incubator/webwork2/build.properties
URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.properties?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/build.properties (original)
+++ incubator/webwork2/build.properties Sat May 6 19:32:25 2006
@@ -1,4 +1,4 @@
-name = struts-action
+name = struts-core
fullname = Struts Action 2
version = 2.0-dev
status = integration
Modified: incubator/webwork2/core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/core/pom.xml?rev=400385&r1=400381&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/core/pom.xml (original)
+++ incubator/webwork2/core/pom.xml Sat May 6 19:32:25 2006
@@ -8,9 +8,17 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action</artifactId>
+ <artifactId>struts-core</artifactId>
<packaging>jar</packaging>
- <name>Struts Action Framework 2.0</name>
+ <name>Struts Action 2 - Core</name>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scp://people.apache.org/www/struts.apache.org/struts-action2/core</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<!-- unreferenced dependencies:
* clover, mockobjects, xdoclet : only needed for build
@@ -25,38 +33,39 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>action-api</artifactId>
+ <version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>freemarker</groupId>
<artifactId>freemarker</artifactId>
+ <version>2.3.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>2.0</version>
<optional>true</optional>
</dependency>
@@ -64,6 +73,7 @@
<dependency>
<groupId>uk.ltd.getahead</groupId>
<artifactId>dwr</artifactId>
+ <version>1.1-beta-3</version>
<optional>true</optional>
</dependency>
@@ -71,12 +81,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
+ <version>1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
+ <version>1.1</version>
<optional>true</optional>
</dependency>
@@ -84,19 +96,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>pell-multipart</artifactId>
- <!-- webwork's ivy dependency reports mentions v1.19 ? -->
+ <version>1.1</version>
<optional>true</optional>
</dependency>
@@ -104,6 +104,7 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
+ <version>2.2.1</version>
<optional>true</optional>
</dependency>
@@ -111,12 +112,14 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
+ <version>5.1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
+ <version>3.1.0</version>
<optional>true</optional>
</dependency>
@@ -176,13 +179,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1.1</version>
- <optional>true</optional>
- </dependency>
-
<!-- used by PrettyPrintWriter (debugging interceptor) and QuickStart -->
<dependency>
<groupId>xstream</groupId>
@@ -190,35 +186,17 @@
<version>1.1.2</version>
</dependency>
- <!-- Jasper -->
- <dependency>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <optional>true</optional>
- </dependency>
-
- <!-- JFree -->
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>gnujaxp</groupId>
- <artifactId>gnujaxp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Tiles -->
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>tiles-core</artifactId>
+ <version>0.2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
+ <version>1.7</version>
<optional>true</optional>
</dependency>
@@ -226,12 +204,14 @@
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
+ <version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
+ <version>1.0.1-rc4</version>
<optional>true</optional>
</dependency>
@@ -239,6 +219,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-10-SNAPSHOT</version>
<optional>true</optional>
</dependency>
@@ -246,30 +227,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
+ <version>1.2.6</version>
<scope>test</scope>
</dependency>
@@ -278,6 +264,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
+ <version>3.8.1</version>
<!-- has to be compile for WebWorkTestCase, which is part of the base package so others can write unit tests -->
<optional>true</optional>
</dependency>
@@ -285,58 +272,68 @@
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
+ <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
+ <version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymockclassextension</artifactId>
+ <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
+ <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
+ <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3</artifactId>
+ <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3</artifactId>
+ <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
+ <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
+ <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>1.2.9</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java?rev=400385&r1=400381&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java (original)
+++ incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java Sat May 6 19:32:25 2006
@@ -1,5 +1,5 @@
/*
- * $Id: $
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
*
Modified: incubator/webwork2/osbuild.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/osbuild.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/osbuild.xml Sat May 6 19:32:25 2006
@@ -30,7 +30,7 @@
<property name="lib.build" value="${lib}/build"/>
<property name="lib.optional" value="${lib}/optional"/>
- <property name="src" location="action/src"/>
+ <property name="src" location="core/src"/>
<property name="src.java" value="${src}/main/java"/>
<property name="src.test" value="${src}/test/java/"/>
@@ -342,7 +342,7 @@
<!-- =================================================================== -->
<target name="fixcrlf" description="Fixed CR/LF problems">
<echo>Running fixcrlf....</echo>
- <fixcrlf eol="lf" srcdir="${basedir}/action/src"
+ <fixcrlf eol="lf" srcdir="${basedir}/core/src"
includes="**/*.sh,
**/*.properties,
**/*.sql,
Modified: incubator/webwork2/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Sat May 6 19:32:25 2006
@@ -85,8 +85,8 @@
</mailingList>
</mailingLists>
<modules>
- <module>action-api</module>
- <module>action</module>
+ <module>core</module>
+ <module>thirdparty</module>
<module>webapps</module>
</modules>
<repositories>
@@ -203,346 +203,5 @@
</plugin>
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>action-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>action</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <version>${project.version}</version>
- <artifactId>action-jasperreports</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <version>${project.version}</version>
- <artifactId>action-jfreechart</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <version>${project.version}</version>
- <artifactId>action-pell-file-upload</artifactId>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>xwork</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
-
- <!-- Ajax -->
- <dependency>
- <groupId>uk.ltd.getahead</groupId>
- <artifactId>dwr</artifactId>
- <version>1.1-beta-3</version>
- </dependency>
-
- <!-- Velocity -->
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>1.1</version>
- </dependency>
-
- <!-- File upload -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- <version>05Nov2002</version>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>pell-multipart</artifactId>
- <version>2.1.5</version>
- </dependency>
-
- <!-- Sitemesh -->
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <!-- Quickstart -->
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.4</version>
- </dependency>
-
- <dependency>
- <groupId>eclipse</groupId>
- <artifactId>jdtcore</artifactId>
- <version>3.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.12</version>
- </dependency>
-
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>jspapi</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <!-- Tiles -->
- <dependency>
- <groupId>org.apache.struts.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- </dependency>
-
- <!-- Portlet -->
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>1.0.1-rc4</version>
- </dependency>
-
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-10-SNAPSHOT</version>
- </dependency>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>1.2.6</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.3</artifactId>
- <version>0.09</version>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-alt-jdk1.3</artifactId>
- <version>0.09</version>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.9</version>
- </dependency>
-
- <dependency>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>pell-multipart</artifactId>
- <version>2.1.5</version>
- </dependency>
-
- <dependency>
- <groupId>cewolf</groupId>
- <artifactId>cewolf</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+
</project>
Modified: incubator/webwork2/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/site/site.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/src/site/site.xml (original)
+++ incubator/webwork2/src/site/site.xml Sat May 6 19:32:25 2006
@@ -30,7 +30,7 @@
<menu name="Documentation">
<item
name="Javadoc"
- href="apidocs/index.html"
+ href="core/apidocs/index.html"
/>
<item
name="Source Repository"
Modified: incubator/webwork2/thirdparty/jasperreports/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/jasperreports/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/thirdparty/jasperreports/pom.xml (original)
+++ incubator/webwork2/thirdparty/jasperreports/pom.xml Sat May 6 19:32:25 2006
@@ -8,20 +8,36 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action-jasperreports</artifactId>
+ <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>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/webwork2/thirdparty/jfreechart/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/jfreechart/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/thirdparty/jfreechart/pom.xml (original)
+++ incubator/webwork2/thirdparty/jfreechart/pom.xml Sat May 6 19:32:25 2006
@@ -8,13 +8,22 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action-jfreechart</artifactId>
+ <artifactId>struts-jfreechart</artifactId>
<packaging>jar</packaging>
- <name>JFree Chart</name>
+ <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>
@@ -23,11 +32,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.struts.action2</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
Modified: incubator/webwork2/thirdparty/pell-file-upload/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/pell-file-upload/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/thirdparty/pell-file-upload/pom.xml (original)
+++ incubator/webwork2/thirdparty/pell-file-upload/pom.xml Sat May 6 19:32:25 2006
@@ -8,25 +8,38 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action-pell-file-upload</artifactId>
+ <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>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.struts.action2</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: incubator/webwork2/thirdparty/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/thirdparty/pom.xml (original)
+++ incubator/webwork2/thirdparty/pom.xml Sat May 6 19:32:25 2006
@@ -11,15 +11,17 @@
<artifactId>thirdparty</artifactId>
<packaging>pom</packaging>
<name>Third Party Modules</name>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty</url>
+ </site>
+ </distributionManagement>
+
<modules>
<module>jasperreports</module>
<module>jfreechart</module>
<module>pell-file-upload</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>action</artifactId>
- </dependency>
- </dependencies>
</project>
Modified: incubator/webwork2/webapps/blank/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/blank/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/blank/pom.xml (original)
+++ incubator/webwork2/webapps/blank/pom.xml Sat May 6 19:32:25 2006
@@ -4,14 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapp-blank</artifactId>
+ <artifactId>struts-blank</artifactId>
<packaging>war</packaging>
<name>Blank Webapp</name>
<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>
+
</dependencies>
<build>
@@ -33,4 +47,6 @@
</plugin>
</plugins>
</build>
+
+
</project>
Modified: incubator/webwork2/webapps/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/pom.xml (original)
+++ incubator/webwork2/webapps/pom.xml Sat May 6 19:32:25 2006
@@ -8,7 +8,7 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<packaging>pom</packaging>
<name>Webapps</name>
<modules>
@@ -18,6 +18,14 @@
<module>showcase</module>
<module>starter</module>
</modules>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scp://people.apache.org/www/struts.apache.org/struts-action2/webapps</url>
+ </site>
+ </distributionManagement>
+
<profiles>
<profile>
<id>hostedqa</id>
@@ -87,16 +95,13 @@
</build>
</profile>
</profiles>
+
<dependencies>
+
<dependency>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action</artifactId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: incubator/webwork2/webapps/portlet/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/portlet/pom.xml (original)
+++ incubator/webwork2/webapps/portlet/pom.xml Sat May 6 19:32:25 2006
@@ -4,26 +4,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapp-portlet</artifactId>
+ <artifactId>struts-portlet</artifactId>
<packaging>war</packaging>
<name>Portet Webapp</name>
<dependencies>
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
<groupId>cewolf</groupId>
<artifactId>cewolf</artifactId>
<version>1.0</version>
@@ -33,6 +29,13 @@
<artifactId>gnujaxp</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/webwork2/webapps/shopping-cart/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/shopping-cart/pom.xml (original)
+++ incubator/webwork2/webapps/shopping-cart/pom.xml Sat May 6 19:32:25 2006
@@ -4,14 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapp-shopping-cart</artifactId>
+ <artifactId>struts-shopping-cart</artifactId>
<packaging>war</packaging>
<name>Shopping Cart Webapp</name>
<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>
+
</dependencies>
<build>
Modified: incubator/webwork2/webapps/showcase/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/pom.xml (original)
+++ incubator/webwork2/webapps/showcase/pom.xml Sat May 6 19:32:25 2006
@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapp-showcase</artifactId>
+ <artifactId>struts-showcase</artifactId>
<packaging>war</packaging>
<name>Showcase Webapp</name>
<profiles>
@@ -25,54 +25,23 @@
<dependencies>
<dependency>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>action-jasperreports</artifactId>
+ <artifactId>struts-jasperreports</artifactId>
+ <version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- </dependency>
-
- <dependency>
- <groupId>uk.ltd.getahead</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
-
+
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <version>1.2.1</version>
+ <groupId>opensymphony</groupId>
+ <artifactId>sitemesh</artifactId>
+ <version>2.2.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>action-jasperreports</artifactId>
- </dependency>
</dependencies>
<build>
Modified: incubator/webwork2/webapps/starter/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/starter/pom.xml?rev=400385&r1=400384&r2=400385&view=diff
==============================================================================
--- incubator/webwork2/webapps/starter/pom.xml (original)
+++ incubator/webwork2/webapps/starter/pom.xml Sat May 6 19:32:25 2006
@@ -4,14 +4,29 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapps</artifactId>
+ <artifactId>struts-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
- <artifactId>webapp-starter</artifactId>
+ <artifactId>struts-starter</artifactId>
<packaging>war</packaging>
<name>Starter Webapp</name>
<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>
+
+
</dependencies>
<build>