You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/01/22 13:40:52 UTC
svn commit: r736624 - in /tiles/framework/trunk: assembly/pom.xml
assembly/src/main/assembly/bin-j4.xml assembly/src/main/assembly/bin.xml
tiles-compat/pom.xml
Author: apetrelli
Date: Thu Jan 22 04:40:52 2009
New Revision: 736624
URL: http://svn.apache.org/viewvc?rev=736624&view=rev
Log:
TILES-355
Not much done about the descriptors.
The assembly module pom is a bit lighter.
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/tiles-compat/pom.xml
Modified: tiles/framework/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=736624&r1=736623&r2=736624&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Thu Jan 22 04:40:52 2009
@@ -42,8 +42,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -64,8 +65,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-3</version>
<executions>
<execution>
<id>make-assembly</id>
@@ -90,7 +92,8 @@
</profiles>
<dependencies>
-
+
+ <!-- Main Tiles packages -->
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
@@ -101,80 +104,42 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-portlet</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-compat</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-test</artifactId>
+ <version>${pom.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <!-- Tiles retrotranslated packages -->
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
@@ -185,12 +150,6 @@
<artifactId>tiles-core</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -198,12 +157,6 @@
<artifactId>tiles-servlet</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -211,12 +164,6 @@
<artifactId>tiles-portlet</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -224,20 +171,6 @@
<artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -245,43 +178,9 @@
<artifactId>tiles-compat</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-test</artifactId>
- <version>${pom.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
</dependency>
+ <!-- Retrotranslator dependencies -->
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
@@ -296,6 +195,7 @@
<scope>runtime</scope>
</dependency>
+ <!-- Optional dependencies that will be redistributed -->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml?rev=736624&r1=736623&r2=736624&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml Thu Jan 22 04:40:52 2009
@@ -30,7 +30,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>/</outputDirectory>
<includes>
<include>org.apache.tiles:tiles-api:jar:j4</include>
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=736624&r1=736623&r2=736624&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Thu Jan 22 04:40:52 2009
@@ -24,6 +24,7 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>commons-logging:commons-logging-api</include>
<include>commons-beanutils:commons-beanutils</include>
@@ -32,6 +33,7 @@
</dependencySet>
<dependencySet>
<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>
@@ -50,6 +52,7 @@
</dependencySet>
<dependencySet>
<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>
@@ -64,6 +67,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>/examples</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.tiles:tiles-test</include>
</includes>
Modified: tiles/framework/trunk/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/pom.xml?rev=736624&r1=736623&r2=736624&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-compat/pom.xml Thu Jan 22 04:40:52 2009
@@ -140,6 +140,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
+ <scope>test</scope>
</dependency>
<dependency>