diff --git a/dashboard/plugin.jelly b/dashboard/plugin.jelly index 5ea76032..c4311496 100644 --- a/dashboard/plugin.jelly +++ b/dashboard/plugin.jelly @@ -97,7 +97,7 @@ ${reactorProject.name} - + ${reactorProject.artifactId} - + + + + + + + + + + @@ -101,7 +122,16 @@ 2 - + + + + + + + + + + diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml index 2f39637e..d4ced241 100644 --- a/dashboard/src/plugin-test/maven.xml +++ b/dashboard/src/plugin-test/maven.xml @@ -49,47 +49,165 @@ name="${maven.gen.docs}/dashboard-report.xml"/> + + Check nb of rows in the report + + Check nb of columns in the report - + Check tasklistclass aggregator - + + Check tasklistmethod aggregator - + + Check tasklist aggregator - + + Check SCM changed file aggregator - + + Check SCM commit aggregator - + - - + + Check that projects have a link to their index.html page + + + + + + + + Check that subproject1 has a link to the checkstyle report + + + + Check that subproject2 has no link to detailed reports + + + + Check the link to the detailed report for each aggregator + + Check csallreport + + + + Check cserrors report + + + + Check cswarnings report + + + + Check csfiles report + + + + Check clovertpc report + + + + Check cloverloc report + + + + Check cloverncloc report + + + + Check junittests report + + + + Check junitpassrate report + + + + Check junitfailures report + + + + Check juniterrors report + + + + Check simiantdl report + + + + Check pmdfiles report + + + + Check pmdviolations report + + + + Check fbfiles report + + + + Check fbviolations report + + + + Check jcoveragelipc report + + + + Check jcoverageloc report + + + + Check tasklistclass report + + + + Check tasklistmethod report + + + + Check tasklist report + + + + Check scmchangedfiles report + + + + Check scmchangedcommit report + + + diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml b/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml new file mode 100644 index 00000000..067863a2 --- /dev/null +++ b/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml @@ -0,0 +1,23 @@ + + + + + Changelog Report + + +
+

Timeframe: 30 days, Total Commits: 0 Total Number of Files Changed: 0

+ + + + + + + + + + +
DateAuthorFile/Message
+
+ +
\ No newline at end of file diff --git a/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml b/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml new file mode 100644 index 00000000..7c1f5f51 --- /dev/null +++ b/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml @@ -0,0 +1,18 @@ + + + + + File Activity Analysis + + +
+

Timeframe: 30 days, Total Commits: 0 Total Number of Files Changed: 0

+ + + + + +
File NameNumber of times changed
+
+ +
\ No newline at end of file diff --git a/dashboard/src/plugin-test/subproject1/maven.xml b/dashboard/src/plugin-test/subproject1/maven.xml index 903ba656..8528043c 100644 --- a/dashboard/src/plugin-test/subproject1/maven.xml +++ b/dashboard/src/plugin-test/subproject1/maven.xml @@ -17,8 +17,10 @@ --> - + + + diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/subproject1/project.xml index f210c87e..a847d0ed 100644 --- a/dashboard/src/plugin-test/subproject1/project.xml +++ b/dashboard/src/plugin-test/subproject1/project.xml @@ -37,6 +37,8 @@ maven-checkstyle-plugin maven-clover-plugin + maven-pmd-plugin + maven-findbugs-plugin maven-junit-report-plugin maven-simian-plugin maven-jcoverage-plugin diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml index 8bc64adf..d5d9f2e5 100644 --- a/dashboard/xdocs/changes.xml +++ b/dashboard/xdocs/changes.xml @@ -25,6 +25,9 @@ + + Added links to reports for all aggregators. + Added aggregators for JavaNCSS. diff --git a/dashboard/xdocs/properties.xml b/dashboard/xdocs/properties.xml index ff70231a..32c96e24 100644 --- a/dashboard/xdocs/properties.xml +++ b/dashboard/xdocs/properties.xml @@ -61,10 +61,23 @@ maven.dashboard.template.legend = ${plugin.resources}/templates/legend.jsl # (otherwise the reactor will be run again on your child projects). maven.dashboard.runreactor = true -# If true, do not show projects for which gathered data is empty for all +# If false, do not show projects for which gathered data is empty for all # aggregators. maven.dashboard.report.showempty = true +# Images used when generating the progress bar for the dashboard HTML color +# for left bar +maven.dashboard.report.bar.left = green + +# HTML color for right bar +maven.dashboard.report.bar.right = red + +# Image to set cells with (should be transparent) +maven.dashboard.report.bar.image = images/trans.gif +maven.dashboard.report.bar.height = 10 +maven.dashboard.report.bar.border = 0 +maven.dashboard.report.bar.displayLabel = true + # Properties for gathering dashboard data for a single project # ------------------------------------------------------------ @@ -89,6 +102,7 @@ maven.dashboard.aggregator.csfiles.artifact = ${maven.build.dir}/checkstyle-raw- maven.dashboard.aggregator.csfiles.label = CS Files maven.dashboard.aggregator.csfiles.goal = checkstyle maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle +maven.dashboard.aggregator.csfiles.report = checkstyle-report.html # Properties for the Checkstyle error/warning aggregator (all errors/warnings) maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly @@ -96,6 +110,7 @@ maven.dashboard.aggregator.csall.artifact = ${maven.build.dir}/checkstyle-raw-re maven.dashboard.aggregator.csall.label = CS err/warn maven.dashboard.aggregator.csall.goal = checkstyle maven.dashboard.aggregator.csall.description = Number of Checkstyle errors and warnings +maven.dashboard.aggregator.csall.report = checkstyle-report.html # Properties for the Checkstyle error aggregator (only errors) maven.dashboard.aggregator.cserrors.script = ${maven.dashboard.aggregators.dir}/cserrors.jelly @@ -103,6 +118,7 @@ maven.dashboard.aggregator.cserrors.artifact = ${maven.build.dir}/checkstyle-raw maven.dashboard.aggregator.cserrors.label = CS errors maven.dashboard.aggregator.cserrors.goal = checkstyle maven.dashboard.aggregator.cserrors.description = Number of Checkstyle errors +maven.dashboard.aggregator.cserrors.report = checkstyle-report.html # Properties for the Checkstyle warning aggregator (only warnings) maven.dashboard.aggregator.cswarnings.script = ${maven.dashboard.aggregators.dir}/cswarnings.jelly @@ -110,6 +126,7 @@ maven.dashboard.aggregator.cswarnings.artifact = ${maven.build.dir}/checkstyle-r maven.dashboard.aggregator.cswarnings.label = CS warnings maven.dashboard.aggregator.cswarnings.goal = checkstyle maven.dashboard.aggregator.cswarnings.description = Number of Checkstyle warnings +maven.dashboard.aggregator.cswarnings.report = checkstyle-report.html # Properties for the Clover TPC aggregator (TPC = Total Percent Coverage) maven.dashboard.aggregator.clovertpc.script = ${maven.dashboard.aggregators.dir}/clovertpc.jelly @@ -117,6 +134,7 @@ maven.dashboard.aggregator.clovertpc.artifact = ${maven.build.dir}/clover.xml maven.dashboard.aggregator.clovertpc.label = Clover TPC maven.dashboard.aggregator.clovertpc.goal = clover maven.dashboard.aggregator.clovertpc.description = Number of test coverage percentage +maven.dashboard.aggregator.clovertpc.report = clover/index.html # Properties for the Clover LOC aggregator (LOC = Line Of Code) maven.dashboard.aggregator.cloverloc.script = ${maven.dashboard.aggregators.dir}/cloverloc.jelly @@ -124,6 +142,7 @@ maven.dashboard.aggregator.cloverloc.artifact = ${maven.build.dir}/clover.xml maven.dashboard.aggregator.cloverloc.label = Clover LOC maven.dashboard.aggregator.cloverloc.goal = clover maven.dashboard.aggregator.cloverloc.description = Number of line of code (including comments) +maven.dashboard.aggregator.cloverloc.report = clover/index.html # Properties for the Clover NCLOC aggregator (NCLOC = Non Comment Line Of Code) maven.dashboard.aggregator.cloverncloc.script = ${maven.dashboard.aggregators.dir}/cloverncloc.jelly @@ -131,6 +150,7 @@ maven.dashboard.aggregator.cloverncloc.artifact = ${maven.build.dir}/clover.xml maven.dashboard.aggregator.cloverncloc.label = Clover NCLOC maven.dashboard.aggregator.cloverncloc.goal = clover maven.dashboard.aggregator.cloverncloc.description = Number of non-commented lines of code +maven.dashboard.aggregator.cloverncloc.report = clover/index.html # Properties for the JUnit Test aggregator maven.dashboard.aggregator.junittests.script = ${maven.dashboard.aggregators.dir}/junittests.jelly @@ -138,6 +158,7 @@ maven.dashboard.aggregator.junittests.artifact = ${maven.build.dir}/TESTS-TestSu maven.dashboard.aggregator.junittests.label = JUnit Tests maven.dashboard.aggregator.junittests.goal = junit-report:report maven.dashboard.aggregator.junittests.description = Number of JUnit tests +maven.dashboard.aggregator.junittests.report = junit-report.html # Properties for the JUnit Failures aggregator maven.dashboard.aggregator.junitfailures.script = ${maven.dashboard.aggregators.dir}/junitfailures.jelly @@ -145,6 +166,7 @@ maven.dashboard.aggregator.junitfailures.artifact = ${maven.build.dir}/TESTS-Tes maven.dashboard.aggregator.junitfailures.label = JUnit Failures maven.dashboard.aggregator.junitfailures.goal = junit-report:report maven.dashboard.aggregator.junitfailures.description = Number of JUnit test failures +maven.dashboard.aggregator.junitfailures.report = junit-report.html # Properties for the JUnit Errors aggregator maven.dashboard.aggregator.juniterrors.script = ${maven.dashboard.aggregators.dir}/juniterrors.jelly @@ -152,6 +174,7 @@ maven.dashboard.aggregator.juniterrors.artifact = ${maven.build.dir}/TESTS-TestS maven.dashboard.aggregator.juniterrors.label = JUnit Errors maven.dashboard.aggregator.juniterrors.goal = junit-report:report maven.dashboard.aggregator.juniterrors.description = Number of JUnit test errors +maven.dashboard.aggregator.juniterrors.report = junit-report.html # Properties for the JUnit Pass Rate aggregator maven.dashboard.aggregator.junitpassrate.script = ${maven.dashboard.aggregators.dir}/junitpassrate.jelly @@ -159,6 +182,7 @@ maven.dashboard.aggregator.junitpassrate.artifact = ${maven.build.dir}/TESTS-Tes maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate maven.dashboard.aggregator.junitpassrate.goal = junit-report:report maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed +maven.dashboard.aggregator.junitpassrate.report = junit-report.html # Properties for the PMD violations aggregator maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly @@ -166,6 +190,7 @@ maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations maven.dashboard.aggregator.pmdfiles.goal = pmd:report maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations +maven.dashboard.aggregator.pmdfiles.report = pmd-report.html # Properties for the PMD violations aggregator maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly @@ -173,6 +198,7 @@ maven.dashboard.aggregator.pmdviolations.artifact = ${maven.build.dir}/pmd-raw-r maven.dashboard.aggregator.pmdviolations.label = PMD Violations maven.dashboard.aggregator.pmdviolations.goal = pmd:report maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations +maven.dashboard.aggregator.pmdviolations.report = pmd-report.html # Properties for the Simian duplicate lines aggregator maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly @@ -180,6 +206,7 @@ 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 +maven.dashboard.aggregator.simiantdl.report = simian-report.html # Properties for the JCoverage covered lines percent aggregator maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly @@ -187,6 +214,7 @@ maven.dashboard.aggregator.jcoveragelipc.artifact = ${maven.build.dir}/jcoverage 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 +maven.dashboard.aggregator.jcoveragelipc.report = jcoverage/index.html # Properties for the JCoverage total lines aggregator maven.dashboard.aggregator.jcoverageloc.script = ${maven.dashboard.aggregators.dir}/jcoverageloc.jelly @@ -194,44 +222,103 @@ maven.dashboard.aggregator.jcoverageloc.artifact = ${maven.build.dir}/jcoverage/ 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 +maven.dashboard.aggregator.jcoverageloc.report = jcoverage/index.html + +# Properties for the FindBugs file violations aggregator +maven.dashboard.aggregator.fbfiles.script = ${maven.dashboard.aggregators.dir}/fbfiles.jelly +maven.dashboard.aggregator.fbfiles.artifact = ${maven.build.dir}/findbugs-raw-report.xml +maven.dashboard.aggregator.fbfiles.label = FindBugs Files with Violations +maven.dashboard.aggregator.fbfiles.goal = maven-findbugs-plugin:report +maven.dashboard.aggregator.fbfiles.description = Number of files with FindBugs violations +maven.dashboard.aggregator.fbfiles.report = findbugs-report.html + +# Properties for the FindBugs violations aggregator +maven.dashboard.aggregator.fbviolations.script = ${maven.dashboard.aggregators.dir}/fbviolations.jelly +maven.dashboard.aggregator.fbviolations.artifact = ${maven.build.dir}/findbugs-raw-report.xml +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 +maven.dashboard.aggregator.fbviolations.report = findbugs-report.html # 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). +maven.dashboard.aggregator.tasklistclass.description = Total number of classes with task definition (@todo tag). +maven.dashboard.aggregator.tasklistclass.report = task-list.html # 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). +maven.dashboard.aggregator.tasklistmethod.description = Total number of methods with task definition (@todo tag). +maven.dashboard.aggregator.tasklistmethod.report = task-list.html # 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). +maven.dashboard.aggregator.tasklist.description = Total number of task definition (@todo tag). +maven.dashboard.aggregator.tasklist.report = task-list.html # 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.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. +maven.dashboard.aggregator.scmchangedfiles.report = file-activity-report.html # 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.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. +maven.dashboard.aggregator.scmchangedcommit.report = changelog-report.html +# JavaNCSS: total number of packages +maven.dashboard.aggregator.javancsspackagestotal.script = ${maven.dashboard.aggregators.dir}/javancsspackagestotal.jelly +maven.dashboard.aggregator.javancsspackagestotal.artifact = ${maven.build.dir}/javancss-raw-report.xml +maven.dashboard.aggregator.javancsspackagestotal.label = JavaNCSS Packages Total +maven.dashboard.aggregator.javancsspackagestotal.goal = maven-javancss-plugin:report +maven.dashboard.aggregator.javancsspackagestotal.description = Total number of JavaNCSS packages +maven.dashboard.aggregator.javancsspackagestotal.report = javancss-report.html +# JavaNCSS: total number of classes +maven.dashboard.aggregator.javancssclassestotal.script = ${maven.dashboard.aggregators.dir}/javancssclassestotal.jelly +maven.dashboard.aggregator.javancssclassestotal.artifact = ${maven.build.dir}/javancss-raw-report.xml +maven.dashboard.aggregator.javancssclassestotal.label = JavaNCSS Classes Total +maven.dashboard.aggregator.javancssclassestotal.goal = maven-javancss-plugin:report +maven.dashboard.aggregator.javancssclassestotal.description = Total number of JavaNCSS classes +maven.dashboard.aggregator.javancssclassestotal.report = javancss-report.html +# JavaNCSS: total number of functions +maven.dashboard.aggregator.javancssfunctionstotal.script = ${maven.dashboard.aggregators.dir}/javancssfunctionstotal.jelly +maven.dashboard.aggregator.javancssfunctionstotal.artifact = ${maven.build.dir}/javancss-raw-report.xml +maven.dashboard.aggregator.javancssfunctionstotal.label = JavaNCSS Functions Total +maven.dashboard.aggregator.javancssfunctionstotal.goal = maven-javancss-plugin:report +maven.dashboard.aggregator.javancssfunctionstotal.description = Total number of JavaNCSS functions +maven.dashboard.aggregator.javancssfunctionstotal.report = javancss-report.html + +# JavaNCSS: total number of non-commented source statements +maven.dashboard.aggregator.javancssncsstotal.script = ${maven.dashboard.aggregators.dir}/javancssncsstotal.jelly +maven.dashboard.aggregator.javancssncsstotal.artifact = ${maven.build.dir}/javancss-raw-report.xml +maven.dashboard.aggregator.javancssncsstotal.label = JavaNCSS NCSS Total +maven.dashboard.aggregator.javancssncsstotal.goal = maven-javancss-plugin:report +maven.dashboard.aggregator.javancssncsstotal.description = Total number of JavaNCSS non-nommented source statements +maven.dashboard.aggregator.javancssncsstotal.report = javancss-report.html + +# JavaNCSS: total number of javadocs +maven.dashboard.aggregator.javancssjavadocstotal.script = ${maven.dashboard.aggregators.dir}/javancssjavadocstotal.jelly +maven.dashboard.aggregator.javancssjavadocstotal.artifact = ${maven.build.dir}/javancss-raw-report.xml +maven.dashboard.aggregator.javancssjavadocstotal.label = JavaNCSS JavaDocs Total +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 ]]>