Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPDASHBOARD-24

Browse Source 
Incorrect links with multiproject independent navigation.
Now using pom.url in this case.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@368175 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-01-12 00:06:09 +00:00
parent 65fc860e28
commit 85160a8498
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dashboard/plugin.jelly
View File

@ -113,6 +113,9 @@
--> -->
<goal name="dashboard:aggregate"> <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:dirname property="xmlReportDir" file="${maven.dashboard.report.xml}"/>
<a:mkdir dir="${xmlReportDir}"/> <a:mkdir dir="${xmlReportDir}"/>
@ -126,6 +129,9 @@
<x:element name="project"> <x:element name="project">
<x:attribute name="name">${reactorProject.name}</x:attribute> <x:attribute name="name">${reactorProject.name}</x:attribute>
<x:attribute name="artifactId">${reactorProject.artifactId}</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 --> <!-- Extract all reports from the single dashboards -->
<!-- TODO: Find a way to not hardcode the dashboard data <!-- TODO: Find a way to not hardcode the dashboard data

8
dashboard/src/plugin-resources/templates/dashboard.jsl
View File

@ -92,9 +92,17 @@
<j:if test="${shallDisplay == 'true'}"> <j:if test="${shallDisplay == 'true'}">
<tr> <tr>
<x:set var="url" select="string(@url)"/>
<!-- url not defined: aggregate navigation -->
<j:if test="${empty(url)}">
<x:set var="artifactId" select="string(@artifactId)"/> <x:set var="artifactId" select="string(@artifactId)"/>
<j:set var="projecturl" value="${maven.multiproject.aggregateDir}${artifactId}/index.html"/> <j:set var="projecturl" value="${maven.multiproject.aggregateDir}${artifactId}/index.html"/>
<td><a href="${projecturl}"><x:expr select="@name"/></a></td> <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"/> <jsl:applyTemplates select="aggregator"/>
</tr> </tr>
</j:if> </j:if>

1
dashboard/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.9-SNAPSHOT" date="in svn"> <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="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="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="carlos@apache.org">Update the default checkstyle report location to make it compatible with Checkstyle plugin 3.0+ (MPCHECKSTYLE-40).</action> <action dev="aheritier" type="update" issue="MPDASHBOARD-33" due-to="carlos@apache.org">Update the default checkstyle report location to make it compatible with Checkstyle plugin 3.0+ (MPCHECKSTYLE-40).</action>