Author: wsmoak
Date: Wed Jul 12 23:07:04 2006
New Revision: 421507
URL: http://svn.apache.org/viewvc?rev=421507&view=rev
Log:
Add -docs, -apps and -src assemblies. Remove the unused dep.xml and all.xml
files.
STR-2911
Added:
struts/struts1/trunk/assembly/src/main/assembly/apps.xml (with props)
struts/struts1/trunk/assembly/src/main/assembly/docs.xml (with props)
Removed:
struts/struts1/trunk/assembly/src/main/assembly/all.xml
struts/struts1/trunk/assembly/src/main/assembly/dep.xml
Modified:
struts/struts1/trunk/assembly/pom.xml
struts/struts1/trunk/assembly/src/main/assembly/dist.xml
struts/struts1/trunk/assembly/src/main/assembly/lib.xml
struts/struts1/trunk/assembly/src/main/assembly/src.xml
Modified: struts/struts1/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/pom.xml?rev=421507&r1=421506&r2=421507&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/pom.xml (original)
+++ struts/struts1/trunk/assembly/pom.xml Wed Jul 12 23:07:04 2006
@@ -105,7 +105,7 @@
<type>war</type>
</artifactItem>
</artifactItems>
-
<outputDirectory>${project.build.directory}/webapps</outputDirectory>
+
<outputDirectory>${project.build.directory}/apps</outputDirectory>
</configuration>
</execution>
</executions>
@@ -117,6 +117,9 @@
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
<descriptor>src/main/assembly/lib.xml</descriptor>
+ <descriptor>src/main/assembly/apps.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/docs.xml</descriptor>
</descriptors>
<finalName>struts-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
Added: struts/struts1/trunk/assembly/src/main/assembly/apps.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/apps.xml?rev=421507&view=auto
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/apps.xml (added)
+++ struts/struts1/trunk/assembly/src/main/assembly/apps.xml Wed Jul 12
23:07:04 2006
@@ -0,0 +1,24 @@
+<assembly>
+ <id>apps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/apps</directory>
+ <outputDirectory>apps</outputDirectory>
+ <includes>
+ <include>*.war</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: struts/struts1/trunk/assembly/src/main/assembly/apps.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts1/trunk/assembly/src/main/assembly/apps.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts1/trunk/assembly/src/main/assembly/dist.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/dist.xml?rev=421507&r1=421506&r2=421507&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/dist.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/dist.xml Wed Jul 12
23:07:04 2006
@@ -20,8 +20,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/webapps</directory>
- <outputDirectory>webapps</outputDirectory>
+ <directory>target/apps</directory>
+ <outputDirectory>apps</outputDirectory>
<includes>
<include>*.war</include>
</includes>
Added: struts/struts1/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/docs.xml?rev=421507&view=auto
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/docs.xml (added)
+++ struts/struts1/trunk/assembly/src/main/assembly/docs.xml Wed Jul 12
23:07:04 2006
@@ -0,0 +1,88 @@
+<assembly>
+ <id>docs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the website docs in the assembly -->
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/target/site</directory>
+ <outputDirectory>docs/struts-apps</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/blank/target/site</directory>
+ <outputDirectory>docs/struts-apps/struts-blank</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/cookbook/target/site</directory>
+ <outputDirectory>docs/struts-apps/struts-cookbook</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/examples/target/site</directory>
+ <outputDirectory>docs/struts-apps/struts-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/faces-example1/target/site</directory>
+ <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>
+ <fileSet>
+ <directory>../apps/scripting-mailreader/target/site</directory>
+
<outputDirectory>docs/struts-apps/struts-scripting-mailreader</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/strutsel-exercise-taglib/target/site</directory>
+
<outputDirectory>docs/struts-apps/strutsel-exercise-taglib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../core/target/site</directory>
+ <outputDirectory>docs/struts-core</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../el/target/site</directory>
+ <outputDirectory>docs/struts-el</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../extras/target/site</directory>
+ <outputDirectory>docs/struts-extras</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../faces/target/site</directory>
+ <outputDirectory>docs/struts-faces</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../scripting/target/site</directory>
+ <outputDirectory>docs/struts-scripting</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../taglib/target/site</directory>
+ <outputDirectory>docs/struts-taglib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles/target/site</directory>
+ <outputDirectory>docs/struts-tiles</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Propchange: struts/struts1/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts1/trunk/assembly/src/main/assembly/docs.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts1/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/lib.xml?rev=421507&r1=421506&r2=421507&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/lib.xml Wed Jul 12 23:07:04
2006
@@ -5,6 +5,7 @@
</formats>
<dependencySets>
<dependencySet>
+ <outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
Modified: struts/struts1/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/src.xml?rev=421507&r1=421506&r2=421507&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/src.xml Wed Jul 12 23:07:04
2006
@@ -1,25 +1,178 @@
<assembly>
<id>src</id>
<formats>
- <format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <!--fileSets>
+ <fileSets>
+ <!-- Include the source code in the assembly -->
<fileSet>
- <excludes>
- <exclude>**/target/*</exclude>
- </excludes>
- </fileSet>
- </fileSets-->
- <modules>
- <module>apps</module>
- <module>core</module>
- <module>el</module>
- <module>extras</module>
- <module>faces</module>
- <module>mailreader-dao</module>
- <module>scripting</module>
- <module>taglib</module>
- </modules>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps</directory>
+ <outputDirectory>src/apps</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/blank</directory>
+ <outputDirectory>src/apps/blank</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/cookbook</directory>
+ <outputDirectory>src/apps/cookbook</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/examples</directory>
+ <outputDirectory>src/apps/examples</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/faces-example1</directory>
+ <outputDirectory>src/apps/faces-example1</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/faces-example2</directory>
+ <outputDirectory>src/apps/faces-example2</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/mailreader</directory>
+ <outputDirectory>src/apps/mailreader</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/scripting-mailreader</directory>
+ <outputDirectory>src/apps/scripting-mailreader</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/strutsel-exercise-taglib</directory>
+ <outputDirectory>src/apps/strutsel-exercise-taglib</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../assembly</directory>
+ <outputDirectory>src/assembly</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../core</directory>
+ <outputDirectory>src/core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../el</directory>
+ <outputDirectory>src/el</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>src/extras</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../faces</directory>
+ <outputDirectory>src/faces</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../integration</directory>
+ <outputDirectory>src/integration</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../integration/apps-it</directory>
+ <outputDirectory>src/integration/apps-it</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../mailreader-dao</directory>
+ <outputDirectory>src/mailreader-dao</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../scripting</directory>
+ <outputDirectory>src/scripting</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../taglib</directory>
+ <outputDirectory>src/taglib</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles</directory>
+ <outputDirectory>src/tiles</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
