Author: ltheussl Date: Tue Jan 31 11:02:51 2006 New Revision: 373885 URL: http://svn.apache.org/viewcvs?rev=373885&view=rev Log: Move warning message out of j:file
Modified: maven/maven-1/plugins/trunk/dashboard/plugin.jelly Modified: maven/maven-1/plugins/trunk/dashboard/plugin.jelly URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/plugin.jelly?rev=373885&r1=373884&r2=373885&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/dashboard/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/dashboard/plugin.jelly Tue Jan 31 11:02:51 2006 @@ -119,11 +119,21 @@ <a:dirname property="xmlReportDir" file="${maven.dashboard.report.xml}"/> <a:mkdir dir="${xmlReportDir}"/> + <!-- Check if dashboard-single.xml has been generated for each reactor project --> + <j:forEach var="reactorProject" items="${reactorProjects}"> + <j:set var="dashboard.single.report.available" value="false"/> + <u:available file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml"> + <j:set var="dashboard.single.report.available" value="true"/> + </u:available> + <j:if test="${dashboard.single.report.available == 'false'}"> + <echo>*** WARNING: no file dashboard-single.xml found for reactor project: ${reactorProject}</echo> + </j:if> + </j:forEach> + <j:file name="${maven.dashboard.report.xml}" prettyPrint="true" xmlns="dashboard"> <dashboard> <j:forEach var="reactorProject" items="${reactorProjects}"> - <j:set var="dashboard.single.report.available" value="false"/> <u:available file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml"> <!-- FIXME: this should be maven.dashboard.report.single --> @@ -143,13 +153,7 @@ <x:parse var="doc" xml="${dashboardAsFile}"/> <x:copyOf select="$doc//aggregator"/> </x:element> - <j:set var="dashboard.single.report.available" value="true"/> </u:available> - <j:if test="${dashboard.single.report.available == 'false'}"> - <echo> -*** WARNING: no file dashboard-single.xml found for reactor project: ${reactorProject} - </echo> - </j:if> </j:forEach> </dashboard> </j:file>