diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties index 56eee828..16129678 100644 --- a/dashboard/plugin.properties +++ b/dashboard/plugin.properties @@ -217,3 +217,38 @@ maven.dashboard.aggregator.fbviolations.label = FindBugs Violations maven.dashboard.aggregator.fbviolations.goal = maven-findbugs-plugin:report maven.dashboard.aggregator.fbviolations.description = Number of FindBugs violations +# Classes Tasks aggregator +maven.dashboard.aggregator.tasklistclass.script = ${maven.dashboard.aggregators.dir}/task-list-classes.jelly +maven.dashboard.aggregator.tasklistclass.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklistclass.label = Classes Tasks +maven.dashboard.aggregator.tasklistclass.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklistclass.description = Total number of classes with task definition (@todo tag). + +# Methods Tasks aggregator +maven.dashboard.aggregator.tasklistmethod.script = ${maven.dashboard.aggregators.dir}/task-list-methods.jelly +maven.dashboard.aggregator.tasklistmethod.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks +maven.dashboard.aggregator.tasklistmethod.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklistmethod.description = Total number of methods with task definition (@todo tag). + +# All Tasks aggregator +maven.dashboard.aggregator.tasklist.script = ${maven.dashboard.aggregators.dir}/task-list-all.jelly +maven.dashboard.aggregator.tasklist.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklist.label = All Tasks +maven.dashboard.aggregator.tasklist.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklist.description = Total number of task definition (@todo tag). + +# Changed log: total number of scm changed files aggregator +maven.dashboard.aggregator.scmchangedfiles.script = ${maven.dashboard.aggregators.dir}/scmchangedfiles.jelly +maven.dashboard.aggregator.scmchangedfiles.artifact = ${maven.build.dir}/changelog.xml +maven.dashboard.aggregator.scmchangedfiles.label = SCM Changed Files +maven.dashboard.aggregator.scmchangedfiles.goal = maven-changelog-plugin:report +maven.dashboard.aggregator.scmchangedfiles.description = Total number of changed files in scm. + +# Changed log: total number of scm commit aggregator +maven.dashboard.aggregator.scmchangedcommit.script = ${maven.dashboard.aggregators.dir}/scmchangedcommit.jelly +maven.dashboard.aggregator.scmchangedcommit.artifact = ${maven.build.dir}/changelog.xml +maven.dashboard.aggregator.scmchangedcommit.label = SCM commits +maven.dashboard.aggregator.scmchangedcommit.goal = maven-changelog-plugin:report +maven.dashboard.aggregator.scmchangedcommit.description = Total number of scm commit. + diff --git a/dashboard/project.xml b/dashboard/project.xml index 6381cef9..d274bad8 100644 --- a/dashboard/project.xml +++ b/dashboard/project.xml @@ -102,6 +102,11 @@ trecloux@norsys.fr Norsys + + Philippe Kernevez + pkernevez@octo.com + OCTO Technology + diff --git a/dashboard/src/plugin-resources/aggregators/scmchangedcommit.jelly b/dashboard/src/plugin-resources/aggregators/scmchangedcommit.jelly new file mode 100644 index 00000000..0cc48577 --- /dev/null +++ b/dashboard/src/plugin-resources/aggregators/scmchangedcommit.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-resources/aggregators/scmchangedfiles.jelly b/dashboard/src/plugin-resources/aggregators/scmchangedfiles.jelly new file mode 100644 index 00000000..7c082416 --- /dev/null +++ b/dashboard/src/plugin-resources/aggregators/scmchangedfiles.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-resources/aggregators/task-list-all.jelly b/dashboard/src/plugin-resources/aggregators/task-list-all.jelly new file mode 100644 index 00000000..c864e9c6 --- /dev/null +++ b/dashboard/src/plugin-resources/aggregators/task-list-all.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-resources/aggregators/task-list-classes.jelly b/dashboard/src/plugin-resources/aggregators/task-list-classes.jelly new file mode 100644 index 00000000..df35a240 --- /dev/null +++ b/dashboard/src/plugin-resources/aggregators/task-list-classes.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-resources/aggregators/task-list-methods.jelly b/dashboard/src/plugin-resources/aggregators/task-list-methods.jelly new file mode 100644 index 00000000..923b4e6c --- /dev/null +++ b/dashboard/src/plugin-resources/aggregators/task-list-methods.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml index f30e6026..f4fd91ad 100644 --- a/dashboard/src/plugin-test/maven.xml +++ b/dashboard/src/plugin-test/maven.xml @@ -52,5 +52,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard/src/plugin-test/project.properties b/dashboard/src/plugin-test/project.properties index 88c9bb5e..165400c0 100644 --- a/dashboard/src/plugin-test/project.properties +++ b/dashboard/src/plugin-test/project.properties @@ -40,7 +40,7 @@ maven.dashboard.runreactor = false # 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 +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 # Make sure that an XML report is generated whenever Clover is run. Also # inherited by the subprojects. diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml b/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml new file mode 100644 index 00000000..70f120eb --- /dev/null +++ b/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml @@ -0,0 +1,68 @@ + + + + + 2004-11-25 + + + + src/application/META-INF/.cvsignore + 1.1 + + + src/application/META-INF/delete_me.txt + 1.2 + + + + + 2004-11-25 + + + + src/application/META-INF/delete_me.txt + 1.1 + + + + + 2004-11-25 + + + + src/application/META-INF/application.xml + 1.4 + + + + + 2004-11-25 + + + + datamodel/delete_me.txt + 1.1 + + + doc/delete_me.txt + 1.1 + + + release-notes/delete_me.txt + 1.1 + + + script/delete_me.txt + 1.1 + + + + + diff --git a/dashboard/src/plugin-test/subproject1/maven.xml b/dashboard/src/plugin-test/subproject1/maven.xml new file mode 100644 index 00000000..903ba656 --- /dev/null +++ b/dashboard/src/plugin-test/subproject1/maven.xml @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/subproject1/project.xml index 04cb997e..2e3dde81 100644 --- a/dashboard/src/plugin-test/subproject1/project.xml +++ b/dashboard/src/plugin-test/subproject1/project.xml @@ -40,5 +40,6 @@ maven-junit-report-plugin maven-simian-plugin maven-jcoverage-plugin + maven-tasklist-plugin diff --git a/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java b/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java index a317d2f4..3ecf02c2 100644 --- a/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java +++ b/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java @@ -58,17 +58,26 @@ package org.apache.maven.dashboard.test.subproject1; /** * Example voluntarily generating checsktyle errors. + * @todo Used by tasklistclass & tasklist aggregators * * @author Vincent Massol * - * @version $Id: Sample.java,v 1.2 2004/04/30 14:47:11 vmassol Exp $ + * @version $Id: Sample.java,v 1.3 2004/11/26 08:33:00 vmassol Exp $ */ public class Sample { + /** + * @todo Used by tasklistmethod & tasklist aggregators + * + */ public void unusedMethod() { } + /** + * @todo Used by tasklistmethod & tasklist aggregators + * + */ public void someMethod() { new Boolean(true); diff --git a/dashboard/xdocs/aggregators.xml b/dashboard/xdocs/aggregators.xml index 04b7c422..18d2d535 100644 --- a/dashboard/xdocs/aggregators.xml +++ b/dashboard/xdocs/aggregators.xml @@ -165,6 +165,41 @@ Total number of FindBugs violations. + + tasklistclass + Maven Tasks + + Total number of classes with task definition (@todo tag). + + + + tasklistmethod + Maven Tasks + + Total number of methods with task definition (@todo tag). + + + + tasklist + Maven Tasks + + Total number of task definition (@todo tag). + + + + scmchangedfiles + SCM Changed Files + + Total number of changed files in scm. + + + + scmchangedcommit + SCM commits + + Total number of scm commit. + + diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml index 37d52c6f..5b124746 100644 --- a/dashboard/xdocs/changes.xml +++ b/dashboard/xdocs/changes.xml @@ -25,8 +25,15 @@ + + Added Maven Change Log aggregators. + + + Added Maven Tasks List aggregators. + - Added Findbugs aggregators which were missing. + Added Findbugs aggregators which were supposed to have been committed + in the previous version but which somehow were not... diff --git a/dashboard/xdocs/properties.xml b/dashboard/xdocs/properties.xml index f68a6dd1..ff70231a 100644 --- a/dashboard/xdocs/properties.xml +++ b/dashboard/xdocs/properties.xml @@ -180,6 +180,58 @@ maven.dashboard.aggregator.simiantdl.artifact = ${maven.build.dir}/generated-xdo maven.dashboard.aggregator.simiantdl.label = Simian TDL maven.dashboard.aggregator.simiantdl.goal = maven-simian-plugin:report maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines + +# Properties for the JCoverage covered lines percent aggregator +maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly +maven.dashboard.aggregator.jcoveragelipc.artifact = ${maven.build.dir}/jcoverage/coverage.xml +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 + +# Classes Tasks aggregator +maven.dashboard.aggregator.tasklistclass.script = ${maven.dashboard.aggregators.dir}/task-list-classes.jelly +maven.dashboard.aggregator.tasklistclass.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklistclass.label = Classes Tasks +maven.dashboard.aggregator.tasklistclass.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklistclass.description = Number of classes with task definition (@todo tag). + +# Methods Tasks aggregator +maven.dashboard.aggregator.tasklistmethod.script = ${maven.dashboard.aggregators.dir}/task-list-methods.jelly +maven.dashboard.aggregator.tasklistmethod.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks +maven.dashboard.aggregator.tasklistmethod.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklistmethod.description = Number of methods with task definition (@todo tag). + +# All Tasks aggregator +maven.dashboard.aggregator.tasklist.script = ${maven.dashboard.aggregators.dir}/task-list-all.jelly +maven.dashboard.aggregator.tasklist.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml +maven.dashboard.aggregator.tasklist.label = All Tasks +maven.dashboard.aggregator.tasklist.goal = maven-tasklist-plugin:report +maven.dashboard.aggregator.tasklist.description = Number of task definition (@todo tag). + +# Changed log: total number of scm changed files aggregator +maven.dashboard.aggregator.scmchangedfiles.script = D:/Developpement/VMA/maven/dashboard/src/plugin-resources/aggregators/changelogfiles.jelly +maven.dashboard.aggregator.scmchangedfiles.artifact = ${maven.build.dir}/changelog.xml +maven.dashboard.aggregator.scmchangedfiles.label = SCM Changed Files +maven.dashboard.aggregator.scmchangedfiles.goal = maven-changelog-plugin:report +maven.dashboard.aggregator.scmchangedfiles.description = Total number of changed files in scm. + +# Changed log: total number of scm commit aggregator +maven.dashboard.aggregator.scmchangedcommit.script = D:/Developpement/VMA/maven/dashboard/src/plugin-resources/aggregators/changelogcommit.jelly +maven.dashboard.aggregator.scmchangedcommit.artifact = ${maven.build.dir}/changelog.xml +maven.dashboard.aggregator.scmchangedcommit.label = SCM commits +maven.dashboard.aggregator.scmchangedcommit.goal = maven-changelog-plugin:report +maven.dashboard.aggregator.scmchangedcommit.description = Total number of scm commit. + + + ]]>