Author: craigmcc
Date: Wed Jun 14 22:10:00 2006
New Revision: 414466
URL: http://svn.apache.org/viewvc?rev=414466&view=rev
Log:
Add a new top-level assembly for the framework, inspired by Wendy's
version in shale-dist, but with a singularly important advantage: the
unpacked directory structure is buildable with Maven2 exactly as if the
user had checked out the source repository with SVN. The applications
are *not* included, since they now each have their own assembly
mechanisms.
Added:
struts/shale/branches/mvn_reorg/shale-spring/LICENSE.txt
- copied unchanged from r414448,
struts/shale/branches/mvn_reorg/shale-core/LICENSE.txt
struts/shale/branches/mvn_reorg/shale-spring/NOTICE.txt
- copied unchanged from r414448,
struts/shale/branches/mvn_reorg/shale-core/NOTICE.txt
struts/shale/branches/mvn_reorg/src/main/
struts/shale/branches/mvn_reorg/src/main/assembly/
struts/shale/branches/mvn_reorg/src/main/assembly/dep.xml
Modified:
struts/shale/branches/mvn_reorg/pom.xml
Modified: struts/shale/branches/mvn_reorg/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=414466&r1=414465&r2=414466&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/pom.xml Wed Jun 14 22:10:00 2006
@@ -138,10 +138,6 @@
<module>shale-test</module>
<module>shale-tiger</module>
<module>shale-tiles</module>
-<!-- The applications will be packaged separately from the framework
- <module>shale-apps</module>
--->
- <module>shale-dist</module>
</modules>
<repositories>
@@ -161,6 +157,17 @@
</repositories>
<build>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
Added: struts/shale/branches/mvn_reorg/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/src/main/assembly/dep.xml?rev=414466&view=auto
==============================================================================
--- struts/shale/branches/mvn_reorg/src/main/assembly/dep.xml (added)
+++ struts/shale/branches/mvn_reorg/src/main/assembly/dep.xml Wed Jun 14
22:10:00 2006
@@ -0,0 +1,140 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id: pom.xml 414075 2006-06-14 05:06:06Z jmitchell $
+ */
+-->
+<assembly>
+
+ <id>dist</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+
+ <!-- Include top level directory files in the assembly -->
+
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the source code in the assembly -->
+
+ <fileSet>
+ <directory>./src</directory>
+ <outputDirectory>src/</outputDirectory>
+ </fileSet>
+
+ <!-- Include the website docs in the assembly -->
+
+ <fileSet>
+ <directory>./target/site</directory>
+ <outputDirectory>docs/</outputDirectory>
+ </fileSet>
+
+ <!-- Include submodule sources in the assembly -->
+
+ <fileSet>
+ <directory>./shale-clay</directory>
+ <outputDirectory>shale-clay</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-core</directory>
+ <outputDirectory>shale-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-designtime</directory>
+ <outputDirectory>shale-designtime</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-remoting</directory>
+ <outputDirectory>shale-remoting</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-spring</directory>
+ <outputDirectory>shale-spring</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-test</directory>
+ <outputDirectory>shale-test</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-tiger</directory>
+ <outputDirectory>shale-tiger</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./shale-tiles</directory>
+ <outputDirectory>shale-tiles</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>*.txt</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file