Author: apetrelli
Date: Wed Nov 7 10:58:12 2007
New Revision: 592853
URL: http://svn.apache.org/viewvc?rev=592853&view=rev
Log:
WW-2258
Configured the retrotranslator plugin to work in a new profile, in attached
mode.
Removed unnecessary legacy Retrotranslator configuration.
Modified:
struts/struts2/trunk/api/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=592853&r1=592852&r2=592853&view=diff
==============================================================================
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Wed Nov 7 10:58:12 2007
@@ -62,6 +62,33 @@
<version>2.0</version>
</dependency>
</dependencies>
+
+ <profiles>
+ <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-project</goal>
+ </goals>
+ <configuration>
+ <classifier>j4</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=592853&r1=592852&r2=592853&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Nov 7 10:58:12 2007
@@ -151,68 +151,28 @@
<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>
- </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>
- </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>
+ <id>j4</id>
+ <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>
-
<profile>
<id>alljars</id>
<build>
Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?rev=592853&r1=592852&r2=592853&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/trunk/plugins/jfreechart/pom.xml Wed Nov 7 10:58:12 2007
@@ -40,72 +40,6 @@
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/jfreechart/</url>
</scm>
- <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>
- </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>
- </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>
-
<dependencies>
<dependency>
<groupId>jfree</groupId>
Modified: struts/struts2/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=592853&r1=592852&r2=592853&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Wed Nov 7 10:58:12 2007
@@ -86,6 +86,32 @@
</dependencies>
+ <profiles>
+ <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-project</goal>
+ </goals>
+ <configuration>
+ <classifier>j4</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=592853&r1=592852&r2=592853&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Wed Nov 7 10:58:12 2007
@@ -288,26 +288,6 @@
</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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
