Author: mrdon
Date: Sun Apr 2 13:58:14 2006
New Revision: 390901
URL: http://svn.apache.org/viewcvs?rev=390901&view=rev
Log:
Moved apps, el, extras, faces, build, and taglib into action; modified build
files to work correctly
Added:
struts/action/trunk/apps/ (props changed)
- copied from r390885, struts/apps/trunk/
struts/action/trunk/build/
- copied from r390885, struts/build/trunk/
struts/action/trunk/core/
struts/action/trunk/core/conf/
- copied from r390885, struts/action/trunk/conf/
struts/action/trunk/core/maven.xml
- copied unchanged from r390885, struts/action/trunk/maven.xml
struts/action/trunk/core/pom.xml
- copied, changed from r390885, struts/action/trunk/pom.xml
struts/action/trunk/core/project.xml
- copied, changed from r390885, struts/action/trunk/project.xml
struts/action/trunk/core/src/
- copied from r390885, struts/action/trunk/src/
struts/action/trunk/core/xdocs/
- copied from r390885, struts/action/trunk/xdocs/
struts/action/trunk/el/ (props changed)
- copied from r390885, struts/el/trunk/
struts/action/trunk/extras/ (props changed)
- copied from r390885, struts/extras/trunk/
struts/action/trunk/faces/ (props changed)
- copied from r390885, struts/faces/trunk/
struts/action/trunk/taglib/ (props changed)
- copied from r390885, struts/taglib/trunk/
Removed:
struts/action/trunk/conf/
struts/action/trunk/maven.xml
struts/action/trunk/pom.xml
struts/action/trunk/project.xml
struts/action/trunk/src/
struts/action/trunk/xdocs/
struts/apps/trunk/
struts/build/trunk/
struts/el/trunk/
struts/extras/trunk/
struts/faces/trunk/
struts/taglib/trunk/
Modified:
struts/action/trunk/ (props changed)
struts/action/trunk/apps/maven.xml
struts/action/trunk/apps/project.xml
struts/action/trunk/build/maven-nightly.sh.current
struts/action/trunk/build/maven.xml
struts/action/trunk/build/pom.xml
struts/action/trunk/build/project.properties
struts/action/trunk/el/pom.xml
struts/action/trunk/el/project.xml
struts/action/trunk/extras/pom.xml
struts/action/trunk/extras/project.xml
struts/action/trunk/faces/project.xml
struts/action/trunk/taglib/pom.xml
struts/action/trunk/taglib/project.xml
Propchange: struts/action/trunk/
('svn:externals' removed)
Propchange: struts/action/trunk/apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 2 13:58:14 2006
@@ -0,0 +1,6 @@
+.project
+.classpath
+target
+bin
+.settings
+
Modified: struts/action/trunk/apps/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/maven.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/apps/maven.xml (original)
+++ struts/action/trunk/apps/maven.xml Sun Apr 2 13:58:14 2006
@@ -16,7 +16,7 @@
<maven:reactor basedir="${basedir}"
includes="*/project.xml"
- excludes="mailreader-dao/project.xml,build/project.xml"
+
excludes="mailreader-dao/project.xml,../build/project.xml"
goals="java:compile,war:webapp,war:war"
banner="Building Struts apps"
ignoreFailures="false"/>
Modified: struts/action/trunk/apps/project.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/project.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/apps/project.xml (original)
+++ struts/action/trunk/apps/project.xml Sun Apr 2 13:58:14 2006
@@ -19,10 +19,9 @@
-->
- <extend>build/project.xml</extend>
+ <extend>../build/project.xml</extend>
<artifactId>struts-apps</artifactId>
<name>Struts Applications</name>
- <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<!-- ################################################################ -->
@@ -60,9 +59,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.currentVersion}</version>
<url>http://struts.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -71,9 +70,9 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.action</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-extras</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<url>http://struts.apache.org/download.cgi</url>
<properties>
<war.bundle>true</war.bundle>
@@ -82,9 +81,9 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.action</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<url>http://struts.apache.org/download.cgi</url>
<properties>
<war.bundle>true</war.bundle>
Modified: struts/action/trunk/build/maven-nightly.sh.current
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/build/maven-nightly.sh.current?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/build/maven-nightly.sh.current (original)
+++ struts/action/trunk/build/maven-nightly.sh.current Sun Apr 2 13:58:14 2006
@@ -29,7 +29,7 @@
mkdir nightly/logs
mkdir nightly/struts-apps
mkdir nightly/struts-bsf
-mkdir nightly/struts-action
+mkdir nightly/struts-core
mkdir nightly/struts-el
mkdir nightly/struts-faces
mkdir nightly/struts-flow
Modified: struts/action/trunk/build/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/build/maven.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/build/maven.xml (original)
+++ struts/action/trunk/build/maven.xml Sun Apr 2 13:58:14 2006
@@ -18,16 +18,10 @@
<ant:mkdir dir="nightly/"/>
<ant:mkdir dir="nightly/logs/"/>
<ant:mkdir dir="nightly/struts-apps/"/>
- <ant:mkdir dir="nightly/struts-action/"/>
+ <ant:mkdir dir="nightly/struts-core/"/>
<ant:mkdir dir="nightly/struts-el/"/>
<ant:mkdir dir="nightly/struts-extras/"/>
- <ant:mkdir dir="nightly/struts-faces/"/>
- <ant:mkdir dir="nightly/struts-flow/"/>
- <ant:mkdir dir="nightly/struts-sandbox/"/>
- <ant:mkdir dir="nightly/struts-scripting/"/>
- <ant:mkdir dir="nightly/struts-site/"/>
<ant:mkdir dir="nightly/struts-taglib/"/>
- <ant:mkdir dir="nightly/struts-tiles/"/>
<attainGoal name="clean-all"/>
<attainGoal name="build-all"/>
@@ -73,7 +67,7 @@
<maven:reactor
basedir="../"
includes="*/project.xml"
- excludes="build/project.xml"
+ excludes="../build/project.xml"
goals="dist"
banner="Building nightlies"
ignoreFailures="true"/>
@@ -81,7 +75,7 @@
<maven:reactor
basedir="../"
includes="*/project.xml"
- excludes="build/project.xml"
+ excludes="../build/project.xml"
goals="copy-distribution"
banner="Building nightlies"
ignoreFailures="true"/>
@@ -93,7 +87,7 @@
<maven:reactor
basedir="../"
includes="*/project.xml"
- excludes="build/project.xml"
+ excludes="../build/project.xml"
goals="clean"
banner="Building nightlies"
ignoreFailures="true"/>
@@ -107,7 +101,7 @@
<postGoal name="dist:prepare-bin-filesystem">
<!-- Copy Instructions and Readmes -->
<ant:copy todir="${maven.dist.bin.assembly.dir}">
- <ant:fileset dir="build/">
+ <ant:fileset dir="../build/">
<ant:include name="README*"/>
<ant:include name="LICENSE.txt"/>
<ant:include name="STATUS*"/>
@@ -122,7 +116,7 @@
<!-- Copy Instructions and Readmes -->
<ant:copy todir="${maven.dist.src.assembly.dir}">
- <ant:fileset dir="build">
+ <ant:fileset dir="../build">
<ant:include name="README*"/>
<ant:include name="LICENSE.txt"/>
<ant:include name="STATUS*"/>
@@ -133,7 +127,7 @@
<!-- Copy Maven Control files -->
<ant:copy todir="${maven.dist.src.assembly.dir}/build">
- <ant:fileset dir="build">
+ <ant:fileset dir="../build">
<ant:include name="project.*"/>
<ant:include name="*.xml"/>
<ant:include name="*.jsl"/>
@@ -148,7 +142,7 @@
<maven:reactor
basedir="../"
includes="*/project.xml"
- excludes="build/project.xml"
+ excludes="../build/project.xml"
goals="copy-distribution"
banner="Copy nightly artifacts"
ignoreFailures="false"/>
Modified: struts/action/trunk/build/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/build/pom.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/build/pom.xml (original)
+++ struts/action/trunk/build/pom.xml Sun Apr 2 13:58:14 2006
@@ -273,7 +273,6 @@
<module>../el</module>
<module>../extras</module>
<module>../taglib</module>
- <module>../tiles</module>
<!--module>../apps</module-->
</modules>
Modified: struts/action/trunk/build/project.properties
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/build/project.properties?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/build/project.properties (original)
+++ struts/action/trunk/build/project.properties Sun Apr 2 13:58:14 2006
@@ -4,13 +4,13 @@
maven.multiproject.basedir = ../
maven.multiproject.includes = */project.xml
-maven.multiproject.excludes = build/*
+maven.multiproject.excludes = ../build/*
-maven.checkstyle.properties = ${basedir}/build/struts_checks.xml
-maven.checkstyle.header.file = ${basedir}/build/LICENSE.txt
+maven.checkstyle.properties = ../build/struts_checks.xml
+maven.checkstyle.header.file = ../build/LICENSE.txt
maven.checkstyle.format = jalopy
-checkstyle.regexp.header=${basedir}/build/LICENSE.CheckStyle
+checkstyle.regexp.header=../build/LICENSE.CheckStyle
maven.compile.source=1.4
maven.compile.target=1.4
@@ -21,6 +21,6 @@
maven.xdoc.date = left
-maven.jalopy.style = build/struts_jalopy.xml
+maven.jalopy.style = ../build/struts_jalopy.xml
maven.linkcheck.exclude=http://svn.apache.org,http://issues.apache.org
Copied: struts/action/trunk/core/pom.xml (from r390885,
struts/action/trunk/pom.xml)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?p2=struts/action/trunk/core/pom.xml&p1=struts/action/trunk/pom.xml&r1=390885&r2=390901&rev=390901&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Sun Apr 2 13:58:14 2006
@@ -43,7 +43,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>struts-action</artifactId>
+ <artifactId>struts-core</artifactId>
<packaging>jar</packaging>
<version>1.3.2-SNAPSHOT</version>
<name>Struts Action Framework</name>
Copied: struts/action/trunk/core/project.xml (from r390885,
struts/action/trunk/project.xml)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/project.xml?p2=struts/action/trunk/core/project.xml&p1=struts/action/trunk/project.xml&r1=390885&r2=390901&rev=390901&view=diff
==============================================================================
--- struts/action/trunk/project.xml (original)
+++ struts/action/trunk/core/project.xml Sun Apr 2 13:58:14 2006
@@ -19,9 +19,9 @@
-->
- <extend>build/project.xml</extend>
- <artifactId>struts-action</artifactId>
- <currentVersion>1.3.2-SNAPSHOT</currentVersion>
+ <extend>../build/project.xml</extend>
+ <artifactId>struts-core</artifactId>
+
<name>Struts Action Framework</name>
Propchange: struts/action/trunk/el/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 2 13:58:14 2006
@@ -0,0 +1,8 @@
+build.properties
+build
+dist
+target
+struts-el.jpx*
+..jbprojectbak
+velocity.log
+maven.log
Modified: struts/action/trunk/el/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/el/pom.xml (original)
+++ struts/action/trunk/el/pom.xml Sun Apr 2 13:58:14 2006
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
+ <artifactId>struts-core</artifactId>
<version>1.3.2-SNAPSHOT</version>
</dependency>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
Modified: struts/action/trunk/el/project.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/project.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/el/project.xml (original)
+++ struts/action/trunk/el/project.xml Sun Apr 2 13:58:14 2006
@@ -19,9 +19,8 @@
-->
- <extend>build/project.xml</extend>
+ <extend>../build/project.xml</extend>
<artifactId>struts-el</artifactId>
- <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts EL</name>
@@ -72,9 +71,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
@@ -83,9 +82,9 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.action</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
@@ -96,7 +95,7 @@
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
Propchange: struts/action/trunk/extras/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 2 13:58:14 2006
@@ -0,0 +1,3 @@
+.project
+.classpath
+
Modified: struts/action/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/extras/pom.xml (original)
+++ struts/action/trunk/extras/pom.xml Sun Apr 2 13:58:14 2006
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
+ <artifactId>struts-core</artifactId>
<version>1.3.2-SNAPSHOT</version>
</dependency>
Modified: struts/action/trunk/extras/project.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/extras/project.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/extras/project.xml (original)
+++ struts/action/trunk/extras/project.xml Sun Apr 2 13:58:14 2006
@@ -19,9 +19,8 @@
-->
- <extend>build/project.xml</extend>
+ <extend>../build/project.xml</extend>
<artifactId>struts-extras</artifactId>
- <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Extras</name>
@@ -55,9 +54,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
Propchange: struts/action/trunk/faces/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 2 13:58:14 2006
@@ -0,0 +1,6 @@
+.nbattrs
+build
+build.properties
+dist
+target
+release
Modified: struts/action/trunk/faces/project.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/faces/project.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/faces/project.xml (original)
+++ struts/action/trunk/faces/project.xml Sun Apr 2 13:58:14 2006
@@ -19,7 +19,7 @@
-->
- <extend>build/project.xml</extend>
+ <extend>../build/project.xml</extend>
<id>struts-faces</id>
<name>Struts JSF Integration Library</name>
<currentVersion>1.0</currentVersion>
Propchange: struts/action/trunk/taglib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 2 13:58:14 2006
@@ -0,0 +1,6 @@
+
+.classpath
+.project
+target
+jcoverage.ser
+bin
Modified: struts/action/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Sun Apr 2 13:58:14 2006
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
+ <artifactId>struts-core</artifactId>
<version>1.3.2-SNAPSHOT</version>
</dependency>
Modified: struts/action/trunk/taglib/project.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/project.xml?rev=390901&r1=390885&r2=390901&view=diff
==============================================================================
--- struts/action/trunk/taglib/project.xml (original)
+++ struts/action/trunk/taglib/project.xml Sun Apr 2 13:58:14 2006
@@ -19,9 +19,8 @@
-->
- <extend>build/project.xml</extend>
+ <extend>../build/project.xml</extend>
<artifactId>struts-taglib</artifactId>
- <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Taglibs</name>
<package>org.apache.struts.taglib</package>
@@ -56,9 +55,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.action</groupId>
- <artifactId>struts-action</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
