Author: vmassol
Date: Wed Jun 8 03:25:13 2005
New Revision: 189569
URL: http://svn.apache.org/viewcvs?rev=189569&view=rev
Log:
MPDASHBOARD-27: Properties <code>maven.dashboard.basedir</code>,
<code>maven.dashboard.includes</code>, <code>maven.dashboard.excludes</code>
and <code>maven.dashboard.ignoreFailures</code> were ignored and were always
defaulting to their multiproject plugin counterpart.
Modified:
maven/maven-1/plugins/trunk/dashboard/plugin.jelly
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=189569&r1=189568&r2=189569&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dashboard/plugin.jelly Wed Jun 8 03:25:13 2005
@@ -19,6 +19,7 @@
-->
<project
+ xmlns:multiproject="multiproject"
xmlns:j="jelly:core"
xmlns:m="jelly:maven"
xmlns:x="jelly:xml"
@@ -36,24 +37,37 @@
<!--
========================================================================
- Generate a dashboard report.
+ Initialize Dashboard plugin data.
========================================================================
-->
- <goal name="dashboard:report" description="Generate a dashboard report">
+ <goal name="dashboard:init">
<!-- Default reactor properties from the Multiproject plug-in -->
-
+
+ <!-- Make sure the multiproject plugin is loaded -->
+ <multiproject:dependency-handle />
+
<m:get var="mBasedir" property="maven.multiproject.basedir"
plugin="maven-multiproject-plugin"/>
- <m:property var="dBasedir" name="mBaseDir" defaultValue="${basedir}"/>
+ <m:property var="dBasedir" name="maven.dashboard.basedir"
defaultValue="${mBasedir}"/>
<m:get var="mIncludes" property="maven.multiproject.includes"
plugin="maven-multiproject-plugin"/>
- <m:property var="dIncludes" name="mIncludes" defaultValue="*/project.xml"/>
+ <m:property var="dIncludes" name="maven.dashboard.includes"
defaultValue="${mIncludes}"/>
<m:get var="mExcludes" property="maven.multiproject.excludes"
plugin="maven-multiproject-plugin"/>
- <m:property var="dExcludes" name="mExcludes" defaultValue=""/>
+ <m:property var="dExcludes" name="maven.dashboard.excludes"
defaultValue="${mExcludes}"/>
<m:get var="mIgnoreFailures" property="maven.multiproject.ignoreFailures"
plugin="maven-multiproject-plugin"/>
- <m:property var="dIgnoreFailures" name="mIgnoreFailures"
defaultValue="false"/>
+ <m:property var="dIgnoreFailures" name="maven.dashboard.ignoreFailures"
defaultValue="${mIgnoreFailures}"/>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Generate a dashboard report.
+ ========================================================================
+ -->
+ <goal name="dashboard:report" prereqs="dashboard:init"
+ description="Generate a dashboard report">
<!-- Generate dashboard data for all sub-projects if it is required -->
<j:set var="runreactor" value="${maven.dashboard.runreactor}"/>
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=189569&r1=189568&r2=189569&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml Wed Jun 8 03:25:13
2005
@@ -25,6 +25,12 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in svn">
+ <action dev="vmassol" type="fix" issue="MPDASHBOARD-27">
+ Properties <code>maven.dashboard.basedir</code>,
+ <code>maven.dashboard.includes</code>,
<code>maven.dashboard.excludes</code>
+ and <code>maven.dashboard.ignoreFailures</code> were ignored and were
always
+ defaulting to their multiproject plugin counterpart.
+ </action>
<action dev="vmassol" type="fix" issue="MPDASHBOARD-26" due-to="Wim
Deblauwe">
The JUnit pass rate aggregator was no longer showing values in the
dashboard.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
