Author: craigmcc
Date: Thu Jun 15 13:35:29 2006
New Revision: 414673
URL: http://svn.apache.org/viewvc?rev=414673&view=rev
Log:
Trying to do the top-level assembly in the top-level POM doesn't work
because you can't declare both a <module> and a <dependency> for the
same module. Therefore, modify the shale-dist assembly instructions to
create framework artifacts that can reproduce themselves (including the
website).
With these changes, and modulo bugs and cleanups, I think we've licked
the Maven2 migration reorg. But we have some cleanup work to do on the
website pages.
Removed:
struts/shale/branches/mvn_reorg/src/main/assembly/
Modified:
struts/shale/branches/mvn_reorg/pom.xml
struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
Modified: struts/shale/branches/mvn_reorg/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=414673&r1=414672&r2=414673&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/pom.xml Thu Jun 15 13:35:29 2006
@@ -138,6 +138,7 @@
<module>shale-test</module>
<module>shale-tiger</module>
<module>shale-tiles</module>
+ <module>shale-dist</module>
</modules>
<repositories>
@@ -157,17 +158,6 @@
</repositories>
<build>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
Modified: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml?rev=414673&r1=414672&r2=414673&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml Thu Jun 15
13:35:29 2006
@@ -22,6 +22,7 @@
<id>dist</id>
<formats>
+ <format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -35,117 +36,160 @@
<fileSets>
- <!-- Include the source code in the assembly -->
+ <!-- Include top level directory files in the assembly -->
+
<fileSet>
- <directory>../</directory>
- <outputDirectory>src/</outputDirectory>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
<includes>
<include>pom.xml</include>
- <include>src/</include>
+ <include>*.txt</include>
</includes>
</fileSet>
+
+ <!-- Include the source code in the assembly -->
+
+ <fileSet>
+ <directory>../src</directory>
+ <outputDirectory>src/</outputDirectory>
+ </fileSet>
+
+ <!-- Include submodule sources in the assembly -->
+
<fileSet>
<directory>../shale-clay</directory>
- <outputDirectory>src/shale-clay</outputDirectory>
+ <outputDirectory>shale-clay</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../shale-core</directory>
- <outputDirectory>src/shale-core</outputDirectory>
+ <outputDirectory>shale-core</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
-<!--
+
<fileSet>
<directory>../shale-designtime</directory>
- <outputDirectory>src/shale-designtime</outputDirectory>
+ <outputDirectory>shale-designtime</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
--->
+
+ <fileSet>
+ <directory>../shale-dist</directory>
+ <outputDirectory>shale-dist</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
<fileSet>
<directory>../shale-remoting</directory>
- <outputDirectory>src/shale-remoting</outputDirectory>
+ <outputDirectory>shale-remoting</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../shale-spring</directory>
- <outputDirectory>src/shale-spring</outputDirectory>
+ <outputDirectory>shale-spring</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../shale-test</directory>
- <outputDirectory>src/shale-test</outputDirectory>
+ <outputDirectory>shale-test</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../shale-tiger</directory>
- <outputDirectory>src/shale-tiger</outputDirectory>
+ <outputDirectory>shale-tiger</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../shale-tiles</directory>
- <outputDirectory>src/shale-tiles</outputDirectory>
+ <outputDirectory>shale-tiles</outputDirectory>
<includes>
<include>pom.xml</include>
+ <include>*.txt</include>
<include>src/</include>
</includes>
</fileSet>
<!-- Include the website docs in the assembly -->
+
<fileSet>
<directory>../target/site</directory>
<outputDirectory>docs/</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-clay/target/site</directory>
<outputDirectory>docs/shale-clay</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-core/target/site</directory>
<outputDirectory>docs/shale-core</outputDirectory>
</fileSet>
+
<!--
<fileSet>
<directory>../shale-designtime/target/site</directory>
<outputDirectory>docs/shale-designtime</outputDirectory>
</fileSet>
-->
+
<fileSet>
<directory>../shale-remoting/target/site</directory>
<outputDirectory>docs/shale-remoting</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-spring/target/site</directory>
<outputDirectory>docs/shale-spring</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-test/target/site</directory>
<outputDirectory>docs/shale-test</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-tiger/target/site</directory>
<outputDirectory>docs/shale-tiger</outputDirectory>
</fileSet>
+
<fileSet>
<directory>../shale-tiles/target/site</directory>
<outputDirectory>docs/shale-tiles</outputDirectory>
