You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2004/03/13 22:34:21 UTC

cvs commit: maven-plugins/dashboard plugin.jelly

vmassol     2004/03/13 13:34:21

  Modified:    dashboard/xdocs changes.xml
               dashboard plugin.jelly
  Log:
  Prevent the plugin from failing if one <code>dashboard-single.xml</code> fails to be generated.
  
  Revision  Changes    Path
  1.16      +4 -0      maven-plugins/dashboard/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dashboard/xdocs/changes.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- changes.xml	4 Mar 2004 18:03:26 -0000	1.15
  +++ changes.xml	13 Mar 2004 21:34:21 -0000	1.16
  @@ -26,6 +26,10 @@
     <body>
   
       <release version="1.3" date="in CVS">
  +      <action dev="vmassol" type="fix" due-to="Dominique Collette">
  +        Prevent the plugin from failing if one 
  +        <code>dashboard-single.xml</code> fails to be generated.
  +      </action>      
         <action dev="dion" type="update">
           Changed junit-report-1.4-SNAPSHOT to 1.4 release.
         </action>      
  
  
  
  1.8       +16 -13    maven-plugins/dashboard/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dashboard/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly	4 Mar 2004 18:03:25 -0000	1.7
  +++ plugin.jelly	13 Mar 2004 21:34:21 -0000	1.8
  @@ -1,7 +1,8 @@
   <?xml version="1.0"?>
  +
   <!-- 
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2003-2004 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,7 +18,6 @@
    */
    -->
   
  -
   <project
     xmlns:j="jelly:core"
     xmlns:m="jelly:maven"
  @@ -91,19 +91,22 @@
           xmlns="dashboard">
         <dashboard>
           <j:forEach var="reactorProject" items="${reactorProjects}">
  -          <x:element name="project">
  -            <x:attribute name="name">${reactorProject.name}</x:attribute>          
  -
  -            <!-- Extract all reports from the single dashboards -->
  +          <u:available 
  +              file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml">
   
  -            <!-- TODO: Find a way to not hardcode the dashboard data 
  -                 location -->
  -            <u:file var="dashboardAsFile" 
  -                name="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml"/>
  -            <x:parse var="doc" xml="${dashboardAsFile}"/>           
  -            <x:copyOf select="$doc//aggregator"/>
  +            <x:element name="project">
  +              <x:attribute name="name">${reactorProject.name}</x:attribute>          
   
  -          </x:element>        
  +              <!-- Extract all reports from the single dashboards -->
  +  
  +              <!-- TODO: Find a way to not hardcode the dashboard data 
  +                   location -->
  +              <u:file var="dashboardAsFile" 
  +                  name="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml"/>
  +              <x:parse var="doc" xml="${dashboardAsFile}"/>           
  +              <x:copyOf select="$doc//aggregator"/>
  +            </x:element>        
  +          </u:available>
           </j:forEach>
         </dashboard>
       </j:file>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org