You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2005/10/28 01:50:52 UTC
svn commit: r328981 - in /maven/maven-1/plugins/trunk/multichanges:
plugin.jelly project.xml src/plugin-resources/releases.jsl xdocs/changes.xml
Author: aheritier
Date: Thu Oct 27 16:50:44 2005
New Revision: 328981
URL: http://svn.apache.org/viewcvs?rev=328981&view=rev
Log:
MPMULTICHANGES-1 - fix : releases.jsl always used maven.multiproject.aggregateDir
Modified:
maven/maven-1/plugins/trunk/multichanges/plugin.jelly
maven/maven-1/plugins/trunk/multichanges/project.xml
maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl
maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/multichanges/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/plugin.jelly?rev=328981&r1=328980&r2=328981&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/multichanges/plugin.jelly Thu Oct 27 16:50:44 2005
@@ -59,6 +59,9 @@
<x:attribute name="artifactId">
${reactorProject.artifactId}
</x:attribute>
+ <x:attribute name="url">
+ ${reactorProject.url}
+ </x:attribute>
<util:file var="changesAsFile"
name="${reactorProject.context.getVariable('maven.docs.src')}/changes.xml"/>
<j:choose>
Modified: maven/maven-1/plugins/trunk/multichanges/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/project.xml?rev=328981&r1=328980&r2=328981&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/project.xml (original)
+++ maven/maven-1/plugins/trunk/multichanges/project.xml Thu Oct 27 16:50:44 2005
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
* limitations under the License.
*/
-->
-
<project>
<extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
@@ -56,6 +54,16 @@
<role>Creator</role>
<role>Java Developer</role>
</roles>
+ </developer>
+ <developer>
+ <name>Arnaud Heritier</name>
+ <id>aheritier</id>
+ <email>aheritier@apache.org</email>
+ <organization>Octo Technology</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
</developer>
</developers>
<dependencies/>
Modified: maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl?rev=328981&r1=328980&r2=328981&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl (original)
+++ maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl Thu Oct 27 16:50:44 2005
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
* ========================================================================
*
@@ -19,16 +18,8 @@
*
* ========================================================================
-->
-
-<jsl:stylesheet
- select="$doc"
- xmlns:j="jelly:core"
- xmlns:jsl="jelly:jsl"
- xmlns:x="jelly:xml"
- xmlns:maven="jelly:maven"
- xmlns="dummy" trim="false">
-
- <jsl:template match="releases">
+<jsl:stylesheet select="$doc" xmlns:j="jelly:core" xmlns:jsl="jelly:jsl" xmlns:x="jelly:xml" xmlns:maven="jelly:maven" xmlns="dummy" trim="false">
+ <jsl:template match="releases">
<document>
<properties>
<title>Latest releases</title>
@@ -36,46 +27,50 @@
<body>
<section name="Latest releases">
<table>
- <tr>
+ <tr>
<th>Project name</th>
<th>Latest version</th>
<th>Released date</th>
</tr>
-
- <maven:get var="maven.multiproject.aggregateDir"
- plugin="maven-multiproject-plugin"
- property="maven.multiproject.aggregateDir"/>
-
- <x:set var="projects" sort="@date" descending="true"
- select="project[not(@date = 'Not released') and not(@date = 'No information available')]"/>
+ <maven:get var="maven.multiproject.aggregateDir" plugin="maven-multiproject-plugin" property="maven.multiproject.aggregateDir"/>
+ <maven:get var="maven.multiproject.navigation" plugin="maven-multiproject-plugin" property="maven.multiproject.navigation"/>
+ <j:set var="navType" value="${maven.multiproject.navigation}"/>
+ <x:set var="projects" sort="@date" descending="true" select="project[not(@date = 'Not released') and not(@date = 'No information available')]"/>
<j:forEach var="project" items="${projects}">
+ <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
+ <j:choose>
+ <j:when test="${navType eq 'aggregate'}">
+ <j:set var="baseUrl" value="${maven.multiproject.aggregateDir}${artifactId}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="baseUrl"><x:expr select="$project/@url"/></j:set>
+ </j:otherwise>
+ </j:choose>
<tr>
<td>
- <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
- <a href="${maven.multiproject.aggregateDir}${artifactId}/downloads.html">
- <x:expr select="$project/@name"/>
- </a>
+ <a href="${baseUrl}/downloads.html"><x:expr select="$project/@name"/></a>
</td>
<td>
<j:set var="version"><x:expr select="$project/@version"/></j:set>
- <a href="${maven.multiproject.aggregateDir}${artifactId}/announcements/announcement-${version}.txt">
- <x:expr select="$project/@version"/>
- </a>
+ <a href="${baseUrl}/announcements/announcement-${version}.txt"><x:expr select="$project/@version"/></a>
</td>
<td>
<x:expr select="$project/@date"/>
</td>
</tr>
</j:forEach>
- <x:set var="projects" sort="@date" descending="true"
- select="project[@date = 'Not released']"/>
+ <x:set var="projects" sort="@date" descending="true" select="project[@date = 'Not released']"/>
<j:forEach var="project" items="${projects}">
+ <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
+ <j:choose>
+ <j:when test="${navType eq 'aggregate'}">
+ <j:set var="baseUrl" value="${maven.multiproject.aggregateDir}${artifactId}"/>
+ </j:when>
+ <j:set var="baseUrl"><x:expr select="$project/@url"/></j:set>
+ </j:choose>
<tr>
<td>
- <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
- <a href="${maven.multiproject.aggregateDir}${artifactId}/downloads.html">
- <x:expr select="$project/@name"/>
- </a>
+ <a href="${baseUrl}/downloads.html"><x:expr select="$project/@name"/></a>
</td>
<td>
<x:expr select="$project/@version"/>
@@ -85,21 +80,22 @@
</td>
</tr>
</j:forEach>
- <x:set var="projects" sort="@date" descending="true"
- select="project[@date = 'No information available']"/>
+ <x:set var="projects" sort="@date" descending="true" select="project[@date = 'No information available']"/>
<j:forEach var="project" items="${projects}">
+ <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
+ <j:choose>
+ <j:when test="${navType eq 'aggregate'}">
+ <j:set var="baseUrl" value="${maven.multiproject.aggregateDir}${artifactId}"/>
+ </j:when>
+ <j:set var="baseUrl"><x:expr select="$project/@url"/></j:set>
+ </j:choose>
<tr>
<td>
- <j:set var="artifactId"><x:expr select="$project/@artifactId"/></j:set>
- <a href="${maven.multiproject.aggregateDir}${artifactId}/downloads.html">
- <x:expr select="$project/@name"/>
- </a>
+ <a href="${baseUrl}/downloads.html"><x:expr select="$project/@name"/></a>
</td>
<td>
<j:set var="version"><x:expr select="$project/@version"/></j:set>
- <a href="${maven.multiproject.aggregateDir}${artifactId}/announcements/announcement-${version}.txt">
- <x:expr select="$project/@version"/>
- </a>
+ <a href="${baseUrl}/announcements/announcement-${version}.txt"><x:expr select="$project/@version"/></a>
</td>
<td>
<x:expr select="$project/@date"/>
@@ -111,5 +107,4 @@
</body>
</document>
</jsl:template>
-
</jsl:stylesheet>
Modified: maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml?rev=328981&r1=328980&r2=328981&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml Thu Oct 27 16:50:44 2005
@@ -24,7 +24,8 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <release version="1.2-SNAPSHOT" date="in CVS">
+ <release version="1.2-SNAPSHOT" date="in SCM">
+ <action dev="aheriiter" type="fix" issue="MPMULTICHANGES-1">Links always used maven.multiproject.aggregateDir even if maven.multiproject.navigation=independent.</action>
<action dev="carlos" type="add">Linked project names and releases with download pages and announcements</action>
</release>
<release version="1.1" date="2004-05-15"></release>