You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by at...@apache.org on 2007/02/27 01:47:54 UTC
svn commit: r512091 - in /portals/bridges/trunk: applications/jpetstore/
struts/ struts/src/archived/ struts/src/archived/struts-1.2.4/
struts/src/java/META-INF/tlds/struts-1.2.4/
Author: ate
Date: Mon Feb 26 16:47:53 2007
New Revision: 512091
URL: http://svn.apache.org/viewvc?view=rev&rev=512091
Log:
Resolving PB-56: Dropping multiple struts versions build support as it is causing problems for the maven-2 build
See: https://issues.apache.org/jira/browse/PB-56
Added:
portals/bridges/trunk/struts/src/archived/
portals/bridges/trunk/struts/src/archived/struts-1.2.4/
- copied from r511104, portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.4/
Removed:
portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.4/
portals/bridges/trunk/struts/struts-1.2.4-project.xml
Modified:
portals/bridges/trunk/applications/jpetstore/pom.xml
portals/bridges/trunk/struts/maven.xml
portals/bridges/trunk/struts/pom.xml
portals/bridges/trunk/struts/project.properties
portals/bridges/trunk/struts/project.xml
Modified: portals/bridges/trunk/applications/jpetstore/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jpetstore/pom.xml?view=diff&rev=512091&r1=512090&r2=512091
==============================================================================
--- portals/bridges/trunk/applications/jpetstore/pom.xml (original)
+++ portals/bridges/trunk/applications/jpetstore/pom.xml Mon Feb 26 16:47:53 2007
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-struts</artifactId>
+ <artifactId>portals-bridges-struts-${struts.version}</artifactId>
<version>${struts.version}-${portals.bridges.struts.version}</version>
</dependency>
</dependencies>
Modified: portals/bridges/trunk/struts/maven.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/maven.xml?view=diff&rev=512091&r1=512090&r2=512091
==============================================================================
--- portals/bridges/trunk/struts/maven.xml (original)
+++ portals/bridges/trunk/struts/maven.xml Mon Feb 26 16:47:53 2007
@@ -20,63 +20,16 @@
xmlns:util="jelly:util"
xmlns:define="jelly:define">
- <preGoal name="jar:jar">
- <j:choose>
- <j:when test="${pom.artifactId == 'portals-bridges-struts'}">
- <j:set var="strutsVersion" value="1.2.7"/>
- </j:when>
- <j:otherwise>
- <j:set var="strutsVersion" value="${pom.artifactId.substring(23)}"/>
- </j:otherwise>
- </j:choose>
- <!-- enforce the correct artifactId for jar:jar and jar:install -->
- <j:setProperties object="${pom}" artifactId="portals-bridges-struts-${strutsVersion}"/>
- </preGoal>
-
- <preGoal name="jar:install">
- <j:set var="standaloneJarJar" value="false"/>
- </preGoal>
-
- <preGoal name="multiproject:install-callback">
- <j:set var="standaloneJarJar" value="false"/>
- </preGoal>
-
- <preGoal name="java:compile">
- <delete dir="${maven.build.dest}" quiet="true"/>
- <mkdir dir="${maven.build.dest}"/>
- </preGoal>
-
<postGoal name="jar:install">
- <util:file name="${maven.src.dir}/java/META-INF/tlds/struts-${strutsVersion}" var="tldsDir"/>
+ <util:file name="${maven.src.dir}/java/META-INF/tlds/struts-${struts.version}" var="tldsDir"/>
<j:if test="${tldsDir.exists()}">
<j:forEach items="${tldsDir.listFiles()}" var="tldFile">
<j:if test="${tldFile.name.endsWith('.tld')}">
<j:set var="tldPath" value="${tldFile.absolutePath}" />
<j:set var="tldName" value="${tldFile.name.substring(7,tldFile.name.lastIndexOf('.tld'))}" />
- <copy file="${tldPath}" tofile="${maven.repo.local}/${pom.groupId}/tlds/struts-${strutsVersion}-${tldName}-${pom.currentVersion}.tld" overwrite="true" verbose="true"/>
+ <copy file="${tldPath}" tofile="${maven.repo.local}/${pom.groupId}/tlds/struts-${struts.version}-${tldName}-${pom.currentVersion}.tld" overwrite="true" verbose="true"/>
</j:if>
</j:forEach>
- </j:if>
-
- <j:if test="${strutsVersion == '1.2.7'}">
- <maven:reactor basedir="${basedir}"
- includes="struts-1.2.4-project.xml"
- banner="Building and installing Struts Bridge for Struts 1.2.4"
- goals="jar:install"
- ignoreFailures="true" />
- </j:if>
- </postGoal>
-
- <postGoal name="jar:jar">
- <maven:property name="standaloneJarJar" defaultValue="true"/>
- <j:if test="${standaloneJarJar}">
- <j:if test="${strutsVersion == '1.2.7'}">
- <maven:reactor basedir="${basedir}"
- includes="struts-1.2.4-project.xml"
- banner="Building Struts Bridge for Struts 1.2.4"
- goals="jar:jar"
- ignoreFailures="true" />
- </j:if>
</j:if>
</postGoal>
Modified: portals/bridges/trunk/struts/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/pom.xml?view=diff&rev=512091&r1=512090&r2=512091
==============================================================================
--- portals/bridges/trunk/struts/pom.xml (original)
+++ portals/bridges/trunk/struts/pom.xml Mon Feb 26 16:47:53 2007
@@ -27,7 +27,7 @@
<!-- POM Identification -->
- <artifactId>portals-bridges-struts</artifactId>
+ <artifactId>portals-bridges-struts-1.2.7</artifactId>
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
Modified: portals/bridges/trunk/struts/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/project.properties?view=diff&rev=512091&r1=512090&r2=512091
==============================================================================
--- portals/bridges/trunk/struts/project.properties (original)
+++ portals/bridges/trunk/struts/project.properties Mon Feb 26 16:47:53 2007
@@ -16,4 +16,5 @@
maven.multiproject.type=jar
maven.license.licenseFile=${basedir}/../LICENSE.TXT
+struts.version=1.2.7
Modified: portals/bridges/trunk/struts/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/project.xml?view=diff&rev=512091&r1=512090&r2=512091
==============================================================================
--- portals/bridges/trunk/struts/project.xml (original)
+++ portals/bridges/trunk/struts/project.xml Mon Feb 26 16:47:53 2007
@@ -19,7 +19,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
- <id>portals-bridges-struts</id>
+ <id>portals-bridges-struts-${struts.version}</id>
<name>Struts Bridge</name>
<currentVersion>${portals.bridges.struts.version}</currentVersion>
<package>org.apache.portals.bridges.struts</package>
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org