Author: ltheussl
Date: Wed Jan 11 16:06:09 2006
New Revision: 368175
URL: http://svn.apache.org/viewcvs?rev=368175&view=rev
Log:
PR: MPDASHBOARD-24
Incorrect links with multiproject independent navigation.
Now using pom.url in this case.
Modified:
maven/maven-1/plugins/trunk/dashboard/plugin.jelly
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/dashboard/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/plugin.jelly?rev=368175&r1=368174&r2=368175&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dashboard/plugin.jelly Wed Jan 11 16:06:09 2006
@@ -113,6 +113,9 @@
-->
<goal name="dashboard:aggregate">
+ <m:get var="maven.multiproject.navigation"
plugin="maven-multiproject-plugin" property="maven.multiproject.navigation"/>
+ <j:set var="navType" value="${maven.multiproject.navigation}"/>
+
<a:dirname property="xmlReportDir" file="${maven.dashboard.report.xml}"/>
<a:mkdir dir="${xmlReportDir}"/>
@@ -126,6 +129,9 @@
<x:element name="project">
<x:attribute name="name">${reactorProject.name}</x:attribute>
<x:attribute
name="artifactId">${reactorProject.artifactId}</x:attribute>
+ <j:if test="${navType eq 'independent'}">
+ <x:attribute name="url">${reactorProject.url}</x:attribute>
+ </j:if>
<!-- Extract all reports from the single dashboards -->
<!-- TODO: Find a way to not hardcode the dashboard data
Modified:
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl?rev=368175&r1=368174&r2=368175&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
(original)
+++
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
Wed Jan 11 16:06:09 2006
@@ -92,9 +92,17 @@
<j:if test="${shallDisplay == 'true'}">
<tr>
- <x:set var="artifactId" select="string(@artifactId)"/>
- <j:set var="projecturl"
value="${maven.multiproject.aggregateDir}${artifactId}/index.html"/>
- <td><a href="${projecturl}"><x:expr select="@name"/></a></td>
+ <x:set var="url" select="string(@url)"/>
+ <!-- url not defined: aggregate navigation -->
+ <j:if test="${empty(url)}">
+ <x:set var="artifactId" select="string(@artifactId)"/>
+ <j:set var="projecturl"
value="${maven.multiproject.aggregateDir}${artifactId}/index.html"/>
+ <td><a href="${projecturl}"><x:expr select="@name"/></a></td>
+ </j:if>
+ <!-- url defined: independent navigation -->
+ <j:if test="${!empty(url)}">
+ <td><a href="${url}"><x:expr select="@name"/></a></td>
+ </j:if>
<jsl:applyTemplates select="aggregator"/>
</tr>
</j:if>
Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml?rev=368175&r1=368174&r2=368175&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml Wed Jan 11 16:06:09
2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in svn">
+ <action dev="ltheussl" type="fix" issue="MPDASHBOARD-24" due-to="Wim
Deblauwe">Incorrect links with multiproject independent navigation.</action>
<action dev="ltheussl" type="fix" issue="MPDASHBOARD-32" due-to="Wim
Deblauwe"><code>maven.dashboard.report.showempty</code> property not
honored.</action>
<action dev="aheritier" type="fix" issue="MPDASHBOARD-34"
due-to="Philippe Kernevez">Cobertura aggregator don't support offline mode.
From now the Cobertura aggregator works only with MAVEN 1.1.</action>
<action dev="aheritier" type="update" issue="MPDASHBOARD-33"
due-to="[EMAIL PROTECTED]">Update the default checkstyle report location to
make it compatible with Checkstyle plugin 3.0+ (MPCHECKSTYLE-40).</action>
