From 9f3a5ba408da8d31d9920dcbc8ac4393d4bdb2ab Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 27 Oct 2005 23:50:44 +0000
Subject: [PATCH] MPMULTICHANGES-1 - fix : releases.jsl always used
 maven.multiproject.aggregateDir

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@328981 13f79535-47bb-0310-9956-ffa450edef68
---
 multichanges/plugin.jelly                     |  3 +
 multichanges/project.xml                      | 12 ++-
 .../src/plugin-resources/releases.jsl         | 79 +++++++++----------
 multichanges/xdocs/changes.xml                |  3 +-
 4 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/multichanges/plugin.jelly b/multichanges/plugin.jelly
index 131ae807..c5a8afd4 100644
--- a/multichanges/plugin.jelly
+++ b/multichanges/plugin.jelly
@@ -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>
diff --git a/multichanges/project.xml b/multichanges/project.xml
index 1ceeb420..7695d9a6 100644
--- a/multichanges/project.xml
+++ b/multichanges/project.xml
@@ -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>
@@ -57,6 +55,16 @@
         <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/>
 </project>
diff --git a/multichanges/src/plugin-resources/releases.jsl b/multichanges/src/plugin-resources/releases.jsl
index ddcb8a36..380ee01d 100644
--- a/multichanges/src/plugin-resources/releases.jsl
+++ b/multichanges/src/plugin-resources/releases.jsl
@@ -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>
diff --git a/multichanges/xdocs/changes.xml b/multichanges/xdocs/changes.xml
index d2b9eba3..e6104d5f 100644
--- a/multichanges/xdocs/changes.xml
+++ b/multichanges/xdocs/changes.xml
@@ -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>

Project name	Latest version	Released date
- - - - +	- - - +
- - - - +	@@ -85,21 +80,22 @@
- - - - +	- - - +	@@ -111,5 +107,4 @@ - diff --git a/multichanges/xdocs/changes.xml b/multichanges/xdocs/changes.xml index d2b9eba3..e6104d5f 100644 --- a/multichanges/xdocs/changes.xml +++ b/multichanges/xdocs/changes.xml @@ -24,7 +24,8 @@ Vincent Massol - + + Links always used maven.multiproject.aggregateDir even if maven.multiproject.navigation=independent. Linked project names and releases with download pages and announcements