Author: apetrelli
Date: Thu Jul 30 19:04:57 2009
New Revision: 799405
URL: http://svn.apache.org/viewvc?rev=799405&view=rev
Log:
TILES-439
Assembly descriptors reorganized.
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
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=799405&r1=799404&r2=799405&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Thu Jul 30 19:04:57 2009
@@ -135,15 +135,14 @@
<type>war</type>
</dependency>
- <!-- Optional dependencies that will be redistributed -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- <optional>true</optional>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-extras</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
</dependency>
+ <!-- Optional dependencies that will be redistributed -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
@@ -153,19 +152,6 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.6</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<version>2.5.6</version>
<optional>true</optional>
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?rev=799405&r1=799404&r2=799405&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Thu Jul 30
19:04:57 2009
@@ -26,7 +26,7 @@
<outputDirectory>/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>commons-logging:commons-logging-api</include>
+ <include>org.slf4j:slf4j-api</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-digester:commons-digester</include>
</includes>
@@ -35,15 +35,8 @@
<outputDirectory>/lib/optional</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<excludes>
- <exclude>org.apache.tiles:tiles-api</exclude>
- <exclude>org.apache.tiles:tiles-core</exclude>
- <exclude>org.apache.tiles:tiles-servlet</exclude>
- <exclude>org.apache.tiles:tiles-jsp</exclude>
- <exclude>org.apache.tiles:tiles-portlet</exclude>
- <exclude>org.apache.tiles:tiles-compat</exclude>
- <exclude>org.apache.tiles:tiles-test</exclude>
- <exclude>commons-logging:commons-logging</exclude>
- <exclude>commons-logging:commons-logging-api</exclude>
+ <exclude>org.apache.tiles:*</exclude>
+ <exclude>org.slf4j:slf4j-api</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
<exclude>commons-digester:commons-digester</exclude>
</excludes>
@@ -52,13 +45,11 @@
<outputDirectory>/</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.tiles:tiles-api</include>
- <include>org.apache.tiles:tiles-core</include>
- <include>org.apache.tiles:tiles-servlet</include>
- <include>org.apache.tiles:tiles-jsp</include>
- <include>org.apache.tiles:tiles-portlet</include>
- <include>org.apache.tiles:tiles-compat</include>
+ <include>org.apache.tiles:*</include>
</includes>
+ <excludes>
+ <exclude>org.apache.tiles:tiles-test</exclude>
+ </excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/examples</outputDirectory>
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?rev=799405&r1=799404&r2=799405&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/src.xml Thu Jul 30
19:04:57 2009
@@ -70,6 +70,38 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-template</directory>
+ <outputDirectory>src/tiles-template</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-freemarker</directory>
+ <outputDirectory>src/tiles-freemarker</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-velocity</directory>
+ <outputDirectory>src/tiles-velocity</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-extras</directory>
+ <outputDirectory>src/tiles-extras</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-portlet</directory>
<outputDirectory>src/tiles-portlet</outputDirectory>
<includes>
