vmassol     2004/09/20 03:04:46

  Modified:    dashboard/xdocs changes.xml aggregators.xml
               dashboard/src/plugin-test project.properties
               dashboard plugin.properties
  Added:       dashboard/src/plugin-resources/aggregators
                        jcoverageloc.jelly
  Log:
  Added new <code>jcoverageloc</code> aggregator that computes JCoverage total lines 
of code. MPDASHBOARD-12
  
  Revision  Changes    Path
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- changes.xml       6 Sep 2004 16:56:50 -0000       1.24
  +++ changes.xml       20 Sep 2004 10:04:46 -0000      1.25
  @@ -25,6 +25,10 @@
     </properties>
     <body>
       <release version="1.5-SNAPSHOT" date="in CVS">
  +      <action dev="vmassol" type="add" issue="MPDASHBOARD-12" due-to="Thomas 
Recloux">
  +        Added new <code>jcoverageloc</code> aggregator that computes JCoverage total
  +        lines of code.
  +      </action>
         <action dev="vmassol" type="add" issue="MPDASHBOARD-11" due-to="Thomas 
Recloux">
           Added new <code>jcoveragelipc</code> aggregator that computes JCoverage
           lines percentage.
  
  
  
  1.10      +7 -0      maven-plugins/dashboard/xdocs/aggregators.xml
  
  Index: aggregators.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dashboard/xdocs/aggregators.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- aggregators.xml   6 Sep 2004 16:56:50 -0000       1.9
  +++ aggregators.xml   20 Sep 2004 10:04:46 -0000      1.10
  @@ -144,6 +144,13 @@
               Total percentage of lines covered.
             </td>
           </tr>
  +        <tr>
  +          <td>jcoverageloc</td>
  +          <td>JCoverage</td>
  +          <td>
  +            Total number of code lines.
  +          </td>
  +        </tr>        
         </table>
       </section>
    </body>
  
  
  
  1.1                  
maven-plugins/dashboard/src/plugin-resources/aggregators/jcoverageloc.jelly
  
  Index: jcoverageloc.jelly
  ===================================================================
  <?xml version="1.0"?>
  
  <!-- 
  /*
   * Copyright 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.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  <!--
     ========================================================================
       JCoverage aggregator. Extracts JCoverage total code lines.
     ========================================================================
  -->
  <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
  
    <u:file var="artifactAsFile" 
        name="${maven.dashboard.aggregator.jcoverageloc.artifact}"/>
    <j:choose>
      <j:when test="${artifactAsFile.exists()}">
        <x:parse var="doc" xml="${artifactAsFile}"/>
          <x:expr select="count($doc/coverage/class/[EMAIL PROTECTED]>0])"/>
      </j:when>
      <j:otherwise>
        <j:expr value="-"/>
      </j:otherwise>
    </j:choose>
  </j:jelly>
  
  
  1.16      +1 -1      maven-plugins/dashboard/src/plugin-test/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dashboard/src/plugin-test/project.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.properties        6 Sep 2004 16:56:50 -0000       1.15
  +++ project.properties        20 Sep 2004 10:04:46 -0000      1.16
  @@ -36,7 +36,7 @@
   
   # Define what dashboard aggregators will be run. This property is inherited
   # by the subprojects and thus they don't need to define it again.
  -maven.dashboard.aggregators = 
csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,jcoveragelipc
  +maven.dashboard.aggregators = 
csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,jcoveragelipc,jcoverageloc
   
   # Make sure that an XML report is generated whenever Clover is run. Also
   # inherited by the subprojects.
  
  
  
  1.11      +7 -0      maven-plugins/dashboard/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dashboard/plugin.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plugin.properties 6 Sep 2004 16:56:50 -0000       1.10
  +++ plugin.properties 20 Sep 2004 10:04:46 -0000      1.11
  @@ -182,3 +182,10 @@
   maven.dashboard.aggregator.jcoveragelipc.label = JCoverage %lines
   maven.dashboard.aggregator.jcoveragelipc.goal = maven-jcoverage-plugin:report
   maven.dashboard.aggregator.jcoveragelipc.description = JCoverage covered lines 
percentile
  +
  +# Properties for the JCoverage total lines aggregator 
  +maven.dashboard.aggregator.jcoverageloc.script = 
${maven.dashboard.aggregators.dir}/jcoverageloc.jelly
  +maven.dashboard.aggregator.jcoverageloc.artifact = 
${maven.build.dir}/jcoverage/coverage.xml
  +maven.dashboard.aggregator.jcoverageloc.label = JCoverage LOC
  +maven.dashboard.aggregator.jcoverageloc.goal = maven-jcoverage-plugin:report
  +maven.dashboard.aggregator.jcoverageloc.description = JCoverage total lines of code
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to