Author: aheritier
Date: Mon Dec 22 16:54:09 2008
New Revision: 728839

URL: http://svn.apache.org/viewvc?rev=728839&view=rev
Log:
Many improvements on html reports, including several patches on swizzle

Modified:
    maven/sandbox/trunk/reports/maven-html.vm
    maven/sandbox/trunk/reports/maven-plugins-fixed-html.vm
    maven/sandbox/trunk/reports/maven-plugins-html.vm
    maven/sandbox/trunk/reports/reports.sh
    maven/sandbox/trunk/reports/swizzle-jirareport-1.2.3-SNAPSHOT-dep.jar

Modified: maven/sandbox/trunk/reports/maven-html.vm
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven-html.vm?rev=728839&r1=728838&r2=728839&view=diff
==============================================================================
--- maven/sandbox/trunk/reports/maven-html.vm (original)
+++ maven/sandbox/trunk/reports/maven-html.vm Mon Dec 22 16:54:09 2008
@@ -1,9 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-#set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
-#set( $project = $jira.getProject( "MNG" ) )        
-#set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&reset=true&mode=hide&pid=${project.id}&resolution=-1&sorter/field=updated&sorter/order=DESC";
 ) 
-#set( $jirarss = $rss.fetch( $url ) )
-#set( $issues = $jirarss.issues )
 <html xmlns="http://www.w3.org/1999/xhtml";>
   <head>
     <title>Votes on MNG issues in Jira</title>
@@ -42,18 +37,42 @@
        </style>                                                                
                          
   </head>
   <body>
+       #set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
+       #set( $project = $jira.getProject( "MNG" ) )        
+       #set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&reset=true&mode=hide&pid=${project.id}&resolution=-1&sorter/field=updated&sorter/order=DESC&type=-2";
 ) 
+       #set( $jirarss = $rss.fetch( $url ) )
+       #set( $issues = $jirarss.issues )       
     <h1><a href="http://jira.codehaus.org/browse/MNG";>Votes on MNG issues in 
Jira</a> sorted by descending vote count</h1>
+       <p>Last Published : $date.format("EEE MMM dd HH:mm:ss z yyyy")</p>
+    <p>$jirarss.issues.sum("votes") votes for $jirarss.issues.size() open 
issues.</p>  
     <table>
          <tr>
-               <th>Votes</th>
+           <th>&nbsp;</th>
                <th>Key</th>
                <th>Summary</th>
+               <th>Votes</th>
+               <th>Patch ?</th>
+               <th>Testcase ?</th>
          </tr>
       #foreach ( $issue in $issues.descending("votes") )
+         #set ( $fullIssue = $jira.getIssue($issue.key) )
          <tr>
-               <td>$issue.votes</td>
+           <td><img src="$jira.getIssueType($issue.type.id).icon" 
alt="$issue.type.name"/></td>
                <td><a 
href="http://jira.codehaus.org/browse/$issue.key";>$issue.key</a></td>
                <td>$issue.summary</td>
+               <td>$issue.votes</td>
+               <td>#if 
($fullIssue.customFieldValues.matches("customfieldId","customfield_10170").size()>0)
 
+                       X
+                       #else
+                       &nbsp;
+                       #end
+               </td>
+               <td>#if 
($fullIssue.customFieldValues.matches("customfieldId","customfield_10110").size()>0)
+                       X
+                       #else
+                       &nbsp;
+                       #end
+               </td>
          </tr>
       #end
        </table>

Modified: maven/sandbox/trunk/reports/maven-plugins-fixed-html.vm
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven-plugins-fixed-html.vm?rev=728839&r1=728838&r2=728839&view=diff
==============================================================================
--- maven/sandbox/trunk/reports/maven-plugins-fixed-html.vm (original)
+++ maven/sandbox/trunk/reports/maven-plugins-fixed-html.vm Mon Dec 22 16:54:09 
2008
@@ -1,6 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-#set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
-#set( $projects = $jira.getProjects().matches("name", "Maven 2.*Plugin") )
 <html xmlns="http://www.w3.org/1999/xhtml";>
   <head>
     <title>Maven plugins - report on fixed issues</title>
@@ -38,23 +36,28 @@
        -->
        </style>                                                                
                           
   </head>
-  <body>
+  <body>       
+       #set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
+       #set( $projects = $jira.getProjects().matches("name", "Maven 
2.*Plugin") )
     #foreach( $project in $projects )
-    #set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&pid=${project.id}&fixfor=-2&status=5&status=6&sorter/field=issuekey&sorter/order=DESC&tempMax=100&reset=true&decorator=none";
 )
-    #set( $jirarss = $rss.fetch( $url ) )
-    #set( $project.attributes.totalVotes = $jirarss.issues.sum("votes") )
-    ## keep the issues in case you want them later
-    #set( $project.attributes.issues = $jirarss.issues )
+      #set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&pid=${project.id}&fixfor=-2&status=5&status=6&sorter/field=issuekey&sorter/order=DESC&tempMax=300&reset=true&decorator=none&type=-2";
 )
+      #set( $jirarss = $rss.fetch( $url ) )
+      #set( $project.attributes.totalVotes = $jirarss.issues.sum("votes") )
+      ## keep the issues in case you want them later
+      #set( $project.attributes.issues = $jirarss.issues )
     #end
        <h1>Report on fixed issues for unreleased Maven plugins</h1>
+       <p>Last Published : $date.format("EEE MMM dd HH:mm:ss z yyyy")</p>
     <table>
       <tr>
                <th>Plugin</th>
+               <th>Number of fixed issues for non released versions</th>
                <th>Number of votes on fixed issues</th>
          </tr>
        #foreach( $project in $projects.descending("@totalVotes") )
          <tr>
                <td><a href="#$project.name">$project.name</a></td>
+               <td>$project.attributes.issues.size()</td>
                <td>$project.attributes.totalVotes</td>
          </tr>
        #end
@@ -64,15 +67,19 @@
     <p>$project.attributes.totalVotes votes for 
$project.attributes.issues.size() fixed issues</p>
     <table>
       <tr>
-               <th>Votes</th>
+           <th>&nbsp;</th>
                <th>Key</th>
                <th>Summary</th>
+               <th>Votes</th>
+               <th>Fixed in</th>
          </tr>
          #foreach( $issue in $project.attributes.issues.descending("votes") )
          <tr>
-               <td>$issue.votes</td>
+           <td><img src="$jira.getIssueType($issue.type.id).icon" 
alt="$issue.type.name"/></td>
                <td><a 
href="http://jira.codehaus.org/browse/$issue.key";>$issue.key</a></td>
                <td>$issue.summary</td>
+               <td>$issue.votes</td>
+               <td>$issue.fixVersions</td>
          </tr>
          #end
     </table>

Modified: maven/sandbox/trunk/reports/maven-plugins-html.vm
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven-plugins-html.vm?rev=728839&r1=728838&r2=728839&view=diff
==============================================================================
--- maven/sandbox/trunk/reports/maven-plugins-html.vm (original)
+++ maven/sandbox/trunk/reports/maven-plugins-html.vm Mon Dec 22 16:54:09 2008
@@ -1,6 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-#set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
-#set( $projects = $jira.getProjects().matches("name", "Maven 2.*Plugin") )
 <html xmlns="http://www.w3.org/1999/xhtml";>
   <head>
     <title>Maven plugins - report on open issues</title>
@@ -39,23 +37,28 @@
        </style>                                           
   </head>
   <body>
+       #set( $jira = 
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
+       #set( $projects = $jira.getProjects().matches("name", "Maven 
2.*Plugin") )
        #foreach( $project in $projects )
-       #set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&&pid=${project.id}&status=1&sorter/field=issuekey&sorter/order=DESC&tempMax=100&reset=true&decorator=none";
 )
-       #set( $jirarss = $rss.fetch( $url ) )
-       #set( $project.attributes.totalVotes = $jirarss.issues.sum("votes") )
-       ## keep the issues in case you want them later
-       #set( $project.attributes.issues = $jirarss.issues )
+      #set( $url = 
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&&pid=${project.id}&status=1&sorter/field=issuekey&sorter/order=DESC&tempMax=300&reset=true&decorator=none&type=-2";
 )
+         #set( $jirarss = $rss.fetch( $url ) )
+         #set( $project.attributes.totalVotes = $jirarss.issues.sum("votes") )
+         ## keep the issues in case you want them later
+         #set( $project.attributes.issues = $jirarss.issues )
        #end
        <h1>Report on open issues for Maven plugins</h1>
+       <p>Last Published : $date.format("EEE MMM dd HH:mm:ss z yyyy")</p>
     <table>
       <tr>
                <th>Plugin</th>
+               <th>Number of open issues</th>          
                <th>Number of votes on open issues</th>
          </tr>
        #foreach( $project in $projects.descending("@totalVotes") )
          <tr>
                <td><a href="#$project.name">$project.name</a></td>
-               <td>$project.attributes.totalVotes</td>
+               <td>$project.attributes.issues.size()</td>
+               <td>$project.attributes.totalVotes</td>         
          </tr>
        #end
     </table>
@@ -64,15 +67,32 @@
     <p>$project.attributes.totalVotes votes for 
$project.attributes.issues.size() open issues.</p>
     <table>
       <tr>
-               <th>Votes</th>
+           <th>&nbsp;</th>
                <th>Key</th>
                <th>Summary</th>
+               <th>Votes</th>
+               <th>Patch ?</th>
+               <th>Testcase ?</th>
          </tr>
          #foreach( $issue in $project.attributes.issues.descending("votes") )
+         #set ( $fullIssue = $jira.getIssue($issue.key) )
          <tr>
-               <td>$issue.votes</td>
+           <td><img src="$jira.getIssueType($issue.type.id).icon" 
alt="$issue.type.name"/></td>
                <td><a 
href="http://jira.codehaus.org/browse/$issue.key";>$issue.key</a></td>
                <td>$issue.summary</td>
+               <td>$issue.votes</td>
+               <td>#if 
($fullIssue.customFieldValues.matches("customfieldId","customfield_10170").size()>0)
 
+                       X
+                       #else
+                       &nbsp;
+                       #end
+               </td>
+               <td>#if 
($fullIssue.customFieldValues.matches("customfieldId","customfield_10110").size()>0)
+                       X
+                       #else
+                       &nbsp;
+                       #end
+               </td>
          </tr>
          #end
     </table>

Modified: maven/sandbox/trunk/reports/reports.sh
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/reports.sh?rev=728839&r1=728838&r2=728839&view=diff
==============================================================================
--- maven/sandbox/trunk/reports/reports.sh (original)
+++ maven/sandbox/trunk/reports/reports.sh Mon Dec 22 16:54:09 2008
@@ -26,23 +26,23 @@
 export CMD="$JAVA_CMD $JAVA_OPTS -jar 
swizzle-jirareport-1.2.3-SNAPSHOT-dep.jar"
 
 echo "Generating maven-votes.txt ..."
-$CMD maven.vm -DentityExpansionLimit=500000 > $OUTPUTDIR/maven-votes.txt
+#$CMD maven.vm -DentityExpansionLimit=500000 > $OUTPUTDIR/maven-votes.txt
 echo "maven-votes.txt generated."
 
 echo "Generating maven-votes.html ..."
-$CMD maven-html.vm -DentityExpansionLimit=500000 > $OUTPUTDIR/maven-votes.html
+#$CMD maven-html.vm -DentityExpansionLimit=500000 > $OUTPUTDIR/maven-votes.html
 echo "maven-votes.html generated."
 
 echo "Generating plugin-votes.txt ..."
-$CMD maven-plugins.vm > $OUTPUTDIR/plugin-votes.txt
+#$CMD maven-plugins.vm > $OUTPUTDIR/plugin-votes.txt
 echo "plugin-votes.txt generated."
 
 echo "Generating plugin-votes.html ..."
-$CMD maven-plugins-html.vm > $OUTPUTDIR/plugin-votes.html
+#$CMD maven-plugins-html.vm > $OUTPUTDIR/plugin-votes.html
 echo "plugin-votes.html generated."
 
 echo "Generating maven-plugins-fixed.txt ..."
-$CMD maven-plugins-fixed.vm > $OUTPUTDIR/maven-plugins-fixed.txt
+#$CMD maven-plugins-fixed.vm > $OUTPUTDIR/maven-plugins-fixed.txt
 echo "maven-plugins-fixed.txt generated."
 
 echo "Generating maven-plugins-fixed.html ..."

Modified: maven/sandbox/trunk/reports/swizzle-jirareport-1.2.3-SNAPSHOT-dep.jar
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/swizzle-jirareport-1.2.3-SNAPSHOT-dep.jar?rev=728839&r1=728838&r2=728839&view=diff
==============================================================================
Binary files - no diff available.


Reply via email to