Author: apetrelli
Date: Wed Mar 28 08:30:18 2007
New Revision: 523369
URL: http://svn.apache.org/viewvc?view=rev&rev=523369
Log:
Concentrated assembly creation inside the "assembly" module
Now assemblies contain also the tiles-test module.
Removed:
tiles/framework/trunk/tiles-api/src/main/assembly/
tiles/framework/trunk/tiles-core/src/main/assembly/
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/assembly/src/main/assembly/src.xml
tiles/framework/trunk/tiles-api/pom.xml
tiles/framework/trunk/tiles-core/pom.xml
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?view=diff&rev=523369&r1=523368&r2=523369
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Wed Mar 28 08:30:18 2007
@@ -59,6 +59,34 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
@@ -78,6 +106,13 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-test</artifactId>
+ <version>${pom.version}</version>
+ <type>war</type>
</dependency>
<dependency>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin.xml?view=diff&rev=523369&r1=523368&r2=523369
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Wed Mar 28
08:30:18 2007
@@ -28,6 +28,7 @@
<exclude>org.apache.tiles:tiles-api</exclude>
<exclude>org.apache.tiles:tiles-core</exclude>
<exclude>org.apache.tiles:tiles-jsp</exclude>
+ <exclude>org.apache.tiles:tiles-test</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -36,6 +37,12 @@
<include>org.apache.tiles:tiles-api</include>
<include>org.apache.tiles:tiles-core</include>
<include>org.apache.tiles:tiles-jsp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/examples</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-test</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tiles/framework/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/src.xml?view=diff&rev=523369&r1=523368&r2=523369
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/src.xml Wed Mar 28
08:30:18 2007
@@ -62,6 +62,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-test</directory>
+ <outputDirectory>src/tiles-test</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../assembly</directory>
<outputDirectory>src/assembly</outputDirectory>
<includes>
Modified: tiles/framework/trunk/tiles-api/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?view=diff&rev=523369&r1=523368&r2=523369
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Wed Mar 28 08:30:18 2007
@@ -65,18 +65,6 @@
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
-
</build>
<profiles>
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=523369&r1=523368&r2=523369
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Wed Mar 28 08:30:18 2007
@@ -69,49 +69,11 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
-
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <executions>
- <execution>
- <id>make-assembly</id>
- <goals>
- <goal>attached</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<!--
