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 2007/10/08 23:03:28 UTC
svn commit: r582973 - in /tiles/framework/branches/TILES_2_0_X: ./ assembly/
assembly/src/main/assembly/ tiles-api/ tiles-core/ tiles-jsp/ tiles-test/
Author: apetrelli
Date: Mon Oct 8 14:03:27 2007
New Revision: 582973
URL: http://svn.apache.org/viewvc?rev=582973&view=rev
Log:
TILES-196
Merge from trunk to TILES_2_0_X branch.
Added configuration to create an assembly for Java 1.4 compatible packages.
Update to 2.2-beta-1 version of Maven Assembly plugin was needed.
Added:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml (contents, props changed)
- copied, changed from r582957, tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
Removed:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin_release.xml
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/src_release.xml
Modified:
tiles/framework/branches/TILES_2_0_X/assembly/pom.xml
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin.xml
tiles/framework/branches/TILES_2_0_X/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-test/pom.xml
Modified: tiles/framework/branches/TILES_2_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/assembly/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/assembly/pom.xml Mon Oct 8 14:03:27 2007
@@ -39,24 +39,16 @@
<url>http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_2_0_X/assembly/</url>
</scm>
- <!-- FIXME Due to some bugs in assembly plugin 2.0.1 and 2.1, we needed to do
- some workaraound. This is the situation:
- 2.0.1: has no "attached" goal; does not use the module directory during
- deployment.
- 2.1: does not include dependencies correctly, so it is unusable.
- So we are using the 2.0.1 version with a "trick", using different assembly
- descriptors during release so it points to the correct directory.
- Hopefully when 2.2 will be released, all these workarounds can be removed.-->
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
- <!-- <version>2.2</version> -->
+ <version>2.2-beta-1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/bin-j4.xml</descriptor>
</descriptors>
<finalName>tiles-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
@@ -73,24 +65,20 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
- <!-- <version>2.2</version> -->
+ <version>2.2-beta-1</version>
<executions>
<execution>
<id>make-assembly</id>
<goals>
- <goal>assembly</goal>
- <!-- <goal>attached</goal> -->
+ <goal>attached</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin_release.xml</descriptor>
- <descriptor>src/main/assembly/src_release.xml</descriptor>
- <!-- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor> -->
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -112,12 +100,65 @@
<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-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>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <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>
+ <groupId>org.apache.tiles</groupId>
+ <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>
+ </exclusions>
</dependency>
<dependency>
Copied: tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml (from r582957, tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml?p2=tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml&p1=tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml&r1=582957&r2=582973&rev=582973&view=diff
==============================================================================
(empty)
Propchange: tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin.xml Mon Oct 8 14:03:27 2007
@@ -38,6 +38,9 @@
<include>org.apache.tiles:tiles-core</include>
<include>org.apache.tiles:tiles-jsp</include>
</includes>
+ <excludes>
+ <exclude>*:j4</exclude>
+ </excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/examples</outputDirectory>
Modified: tiles/framework/branches/TILES_2_0_X/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/pom.xml Mon Oct 8 14:03:27 2007
@@ -105,26 +105,6 @@
<useReleaseProfile>false</useReleaseProfile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>translate</goal>
- </goals>
- <configuration>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml Mon Oct 8 14:03:27 2007
@@ -70,14 +70,6 @@
<profiles>
<profile>
- <!--
- Run the translator for Java 1.4 compatiblity
-
- Sample:
- $ cd tiles-core/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-
- -->
<id>j4</id>
<build>
<plugins>
@@ -88,61 +80,17 @@
<execution>
<id>retrotranslate</id>
<goals>
- <goal>translate</goal>
+ <goal>translate-project</goal>
</goals>
<configuration>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- <destdir>${project.build.directory}/classes-retro</destdir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
+ <attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
</profile>
</profiles>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml Mon Oct 8 14:03:27 2007
@@ -81,84 +81,35 @@
<profiles>
<profile>
- <!--
- Run the translator for Java 1.4 compatiblity
-
- Sample:
- $ cd struts/struts2/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-
- -->
<id>j4</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ </dependency>
+ </dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>retrotranslate</id>
- <goals>
- <goal>translate</goal>
- </goals>
- <configuration>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- <destdir>${project.build.directory}/classes-retro</destdir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <classifier>j4</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
</profile>
</profiles>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml Mon Oct 8 14:03:27 2007
@@ -80,86 +80,43 @@
<profiles>
- <profile>
- <!--
- Run the translator for Java 1.4 compatiblity
-
- Sample:
- $ cd struts/struts2/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-
- -->
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>retrotranslate</id>
- <goals>
- <goal>translate</goal>
- </goals>
- <configuration>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- <destdir>${project.build.directory}/classes-retro</destdir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
- <includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
- </profile>
+ <profile>
+ <id>j4</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <classifier>j4</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>
@@ -173,12 +130,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/pom.xml?rev=582973&r1=582972&r2=582973&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/pom.xml Mon Oct 8 14:03:27 2007
@@ -245,6 +245,34 @@
<hostedqa.appConfigs>121</hostedqa.appConfigs>
</properties>
</profile>
+ <profile>
+ <id>j4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ <goals>
+ <goal>translate-war</goal>
+ </goals>
+ <configuration>
+ <jarfileset>
+ <includes>
+ <include>tiles-*.jar</include>
+ </includes>
+ </jarfileset>
+ <classifier>j4</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>