Author: wsmoak
Date: Tue May 9 20:39:08 2006
New Revision: 405613
URL: http://svn.apache.org/viewcvs?rev=405613&view=rev
Log:
Include the faces-example2 website in the assembly.
Alphabetize the list of webapps and remove duplicate cookbook.
Modified:
struts/action/trunk/assembly/pom.xml
struts/action/trunk/assembly/src/main/assembly/dist.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=405613&r1=405612&r2=405613&view=diff
==============================================================================
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Tue May 9 20:39:08 2006
@@ -61,19 +61,19 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-cookbook</artifactId>
+ <artifactId>struts-blank</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-examples</artifactId>
+ <artifactId>struts-cookbook</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-mailreader</artifactId>
+ <artifactId>struts-examples</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
@@ -85,31 +85,25 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-cookbook</artifactId>
- <version>${version}</version>
- <type>war</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.struts.action</groupId>
<artifactId>struts-faces-example2</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-blank</artifactId>
+ <artifactId>struts-mailreader</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>strutsel-exercise-taglib</artifactId>
+ <artifactId>struts-scripting-mailreader</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.struts.action</groupId>
- <artifactId>struts-scripting-mailreader</artifactId>
+ <artifactId>strutsel-exercise-taglib</artifactId>
<version>${version}</version>
<type>war</type>
</artifactItem>
Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=405613&r1=405612&r2=405613&view=diff
==============================================================================
--- struts/action/trunk/assembly/src/main/assembly/dist.xml (original)
+++ struts/action/trunk/assembly/src/main/assembly/dist.xml Tue May 9 20:39:08
2006
@@ -225,6 +225,10 @@
<outputDirectory>docs/struts-apps/struts-faces-example1</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../apps/faces-example2/target/site</directory>
+ <outputDirectory>docs/struts-apps/struts-faces-example2</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../apps/mailreader/target/site</directory>
<outputDirectory>docs/struts-apps/struts-mailreader</outputDirectory>
</fileSet>
