You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/01/12 02:24:24 UTC
svn commit: r368208 - in /maven/maven-1/plugins/trunk/dashboard: ./
src/plugin-resources/aggregators/ src/plugin-test/ src/plugin-test/common/
src/plugin-test/testIndividualReportsNotGeneratedByDashboard/ xdocs/
Author: ltheussl
Date: Wed Jan 11 17:24:12 2006
New Revision: 368208
URL: http://svn.apache.org/viewcvs?rev=368208&view=rev
Log:
Add new aggregators jiraopen and jirascheduled.
Added:
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jiraopen.jelly
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jirascheduled.jelly
Modified:
maven/maven-1/plugins/trunk/dashboard/plugin.properties
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.properties
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
maven/maven-1/plugins/trunk/dashboard/xdocs/aggregators.xml
maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml
maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/dashboard/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/plugin.properties?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dashboard/plugin.properties Wed Jan 11 17:24:12 2006
@@ -333,3 +333,19 @@
maven.dashboard.aggregator.javancssjavadocstotal.goal = maven-javancss-plugin:report
maven.dashboard.aggregator.javancssjavadocstotal.description = Total number of JavaNCSS JavaDocs
maven.dashboard.aggregator.javancssjavadocstotal.report = javancss-report.html
+
+# Properties for the Jira open issues aggregator
+maven.dashboard.aggregator.jiraopen.script = ${maven.dashboard.aggregators.dir}/jiraopen.jelly
+maven.dashboard.aggregator.jiraopen.artifact = ${maven.build.dir}/jira/jira-results.xml
+maven.dashboard.aggregator.jiraopen.label = JIRA open issues
+maven.dashboard.aggregator.jiraopen.goal = maven-jira-plugin:report
+maven.dashboard.aggregator.jiraopen.description = Number of open issues in JIRA
+maven.dashboard.aggregator.jiraopen.report = jira.html
+
+# Properties for the Jira open scheduled issues aggregator
+maven.dashboard.aggregator.jirascheduled.script = ${maven.dashboard.aggregators.dir}/jirascheduled.jelly
+maven.dashboard.aggregator.jirascheduled.artifact = ${maven.build.dir}/jira/jira-roadmap.xml
+maven.dashboard.aggregator.jirascheduled.label = JIRA open scheduled issues
+maven.dashboard.aggregator.jirascheduled.goal = maven-jira-plugin:report
+maven.dashboard.aggregator.jirascheduled.description = Number of open issues in JIRA that are scheduled for the next release
+maven.dashboard.aggregator.jirascheduled.report = jira-roadmap.html
Added: maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jiraopen.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jiraopen.jelly?rev=368208&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jiraopen.jelly (added)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jiraopen.jelly Wed Jan 11 17:24:12 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-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.
+ */
+ -->
+
+
+<!--
+ ========================================================================
+ Checkstyle error aggregator. Extracts error count from Checkstyle raw
+ XML file (does not count warnings).
+ ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+ <u:file var="artifactAsFile"
+ name="${maven.dashboard.aggregator.jiraopen.artifact}"/>
+ <j:choose>
+ <j:when test="${artifactAsFile.exists()}">
+ <x:parse var="doc" xml="${artifactAsFile}"/>
+ <x:expr select="count($doc//resolution[not(@id)])"/>
+ </j:when>
+ <j:otherwise>
+ <j:expr value="-"/>
+ </j:otherwise>
+ </j:choose>
+
+</j:jelly>
\ No newline at end of file
Added: maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jirascheduled.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jirascheduled.jelly?rev=368208&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jirascheduled.jelly (added)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/aggregators/jirascheduled.jelly Wed Jan 11 17:24:12 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-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.
+ */
+ -->
+
+
+<!--
+ ========================================================================
+ Checkstyle error aggregator. Extracts error count from Checkstyle raw
+ XML file (does not count warnings).
+ ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+ <u:file var="artifactAsFile"
+ name="${maven.dashboard.aggregator.jirascheduled.artifact}"/>
+ <j:choose>
+ <j:when test="${artifactAsFile.exists()}">
+ <x:parse var="doc" xml="${artifactAsFile}"/>
+ <x:expr select="count($doc//resolution[not(@id)])"/>
+ </j:when>
+ <j:otherwise>
+ <j:expr value="-"/>
+ </j:otherwise>
+ </j:choose>
+
+</j:jelly>
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.properties?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.properties (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.properties Wed Jan 11 17:24:12 2006
@@ -34,6 +34,6 @@
# 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,fbfiles,fbviolations,jcoveragelipc,jcoverageloc,tasklistclass,tasklistmethod,tasklist,scmchangedfiles,scmchangedcommit,javancssclassestotal,javancssfunctionstotal,javancssncsstotal,javancsspackagestotal,javancssjavadocstotal
+maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,fbfiles,fbviolations,jcoveragelipc,jcoverageloc,tasklistclass,tasklistmethod,tasklist,scmchangedfiles,scmchangedcommit,javancssclassestotal,javancssfunctionstotal,javancssncsstotal,javancsspackagestotal,javancssjavadocstotal,jiraopen,jirascheduled
maven.junit.fork=true
Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml Wed Jan 11 17:24:12 2006
@@ -27,6 +27,7 @@
<inceptionYear>2003</inceptionYear>
<package>org.apache.maven.dashboard.test</package>
<url>http://maven.apache.org/maven-1.x/reference/plugins/dashboard/</url>
+ <issueTrackingUrl>http://jira.codehaus.org/browse/MPDASHBOARD</issueTrackingUrl>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/dashboard/</connection>
<url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/dashboard/</url>
Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml Wed Jan 11 17:24:12 2006
@@ -54,13 +54,13 @@
<x:set var="count" select="count($doc//body/section/table/tr)"/>
<assert:assertEquals expected="5" value="${count.intValue().toString()}"/>
- <!-- Verify number of columns. One column for the project name and one for the 28
+ <!-- Verify number of columns. One column for the project name and one for the 30
aggregators -->
<ant:echo>Check nb of columns in the report</ant:echo>
<x:set var="countTitleColumn" select="count($doc//body/section/table/tr[1]/th)"/>
<x:set var="countContentColumn" select="count($doc//body/section/table/tr[2]/td)"/>
- <assert:assertEquals expected="29" value="${countTitleColumn.intValue().toString()}"/>
- <assert:assertEquals expected="29" value="${countContentColumn.intValue().toString()}"/>
+ <assert:assertEquals expected="31" value="${countTitleColumn.intValue().toString()}"/>
+ <assert:assertEquals expected="31" value="${countContentColumn.intValue().toString()}"/>
<!-- TasklistClass aggregator test -->
<ant:echo>Check tasklistclass aggregator</ant:echo>
@@ -210,6 +210,15 @@
<ant:echo> Check scmchangedcommit report</ant:echo>
<x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[24]/a/@href)"/>
<assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/changelog-report.html" value="${URL}"/>
-
+
+ <!-- jiraopen -->
+ <ant:echo> Check jiraopen report</ant:echo>
+ <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[30]/a/@href)"/>
+ <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/jira.html" value="${URL}"/>
+ <!-- jirascheduled -->
+ <ant:echo> Check jirascheduled report</ant:echo>
+ <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[31]/a/@href)"/>
+ <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/jira-roadmap.html" value="${URL}"/>
+
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml Wed Jan 11 17:24:12 2006
@@ -42,5 +42,6 @@
<report>maven-jcoverage-plugin</report>
<report>maven-tasklist-plugin</report>
<report>maven-javancss-plugin</report>
+ <report>maven-jira-plugin</report>
</reports>
</project>
Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/aggregators.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/aggregators.xml?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/aggregators.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/aggregators.xml Wed Jan 11 17:24:12 2006
@@ -249,6 +249,23 @@
Total number of JavaNCSS JavaDocs.
</td>
</tr>
+ <tr>
+ <td>jiraopen</td>
+ <td>JIRA open issues</td>
+ <td>
+ Number of open issues in JIRA.
+ <strong>Note:</strong> requires at least maven-jira-plugin-1.3.
+ </td>
+ </tr>
+ <tr>
+ <td>jirascheduled</td>
+ <td>JIRA open scheduled issues</td>
+ <td>
+ Number of open issues in JIRA that are scheduled
+ for the next release.
+ <strong>Note:</strong> requires at least maven-jira-plugin-1.3.
+ </td>
+ </tr>
</table>
</section>
</body>
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=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml Wed Jan 11 17:24:12 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in svn">
+ <action dev="ltheussl" type="add">Add new aggregators <code>jiraopen</code> and <code>jirascheduled</code>.</action>
<action dev="ltheussl" type="fix" issue="MPDASHBOARD-24" due-to="Wim Deblauwe">Incorrect links with multiproject independent navigation.</action>
<action dev="ltheussl" type="fix" issue="MPDASHBOARD-32" due-to="Wim Deblauwe"><code>maven.dashboard.report.showempty</code> property not honored.</action>
<action dev="aheritier" type="fix" issue="MPDASHBOARD-34" due-to="Philippe Kernevez">Cobertura aggregator don't support offline mode. From now the Cobertura aggregator works only with MAVEN 1.1.</action>
Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml?rev=368208&r1=368207&r2=368208&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml Wed Jan 11 17:24:12 2006
@@ -338,6 +338,22 @@
maven.dashboard.aggregator.javancssjavadocstotal.goal = maven-javancss-plugin:report
maven.dashboard.aggregator.javancssjavadocstotal.description = Total number of JavaNCSS JavaDocs
maven.dashboard.aggregator.javancssjavadocstotal.report = javancss-report.html
+
+# Properties for the Jira open issues aggregator
+maven.dashboard.aggregator.jiraopen.script = ${maven.dashboard.aggregators.dir}/jiraopen.jelly
+maven.dashboard.aggregator.jiraopen.artifact = ${maven.build.dir}/jira/jira-results.xml
+maven.dashboard.aggregator.jiraopen.label = JIRA open issues
+maven.dashboard.aggregator.jiraopen.goal = maven-jira-plugin:report
+maven.dashboard.aggregator.jiraopen.description = Number of open issues in JIRA
+maven.dashboard.aggregator.jiraopen.report = jira.html
+
+# Properties for the Jira open scheduled issues aggregator
+maven.dashboard.aggregator.jirascheduled.script = ${maven.dashboard.aggregators.dir}/jirascheduled.jelly
+maven.dashboard.aggregator.jirascheduled.artifact = ${maven.build.dir}/jira/jira-roadmap.xml
+maven.dashboard.aggregator.jirascheduled.label = JIRA open scheduled issues
+maven.dashboard.aggregator.jirascheduled.goal = maven-jira-plugin:report
+maven.dashboard.aggregator.jirascheduled.description = Number of open issues in JIRA that are scheduled for the next release
+maven.dashboard.aggregator.jirascheduled.report = jira-roadmap.html
]]></source>
</section>
</body>