diff --git a/dashboard/src/plugin-test/common/project.properties b/dashboard/src/plugin-test/common/project.properties index b49b54e9..4aad2c76 100644 --- a/dashboard/src/plugin-test/common/project.properties +++ b/dashboard/src/plugin-test/common/project.properties @@ -36,7 +36,4 @@ maven.dashboard.runreactor = false # 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 -# Make sure that an XML report is generated whenever Clover is run. Also -# inherited by the subprojects. -maven.clover.report.xml = true maven.junit.fork=true diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml index 0f559287..0596ae6f 100644 --- a/dashboard/src/plugin-test/maven.xml +++ b/dashboard/src/plugin-test/maven.xml @@ -67,149 +67,150 @@ 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 the checkstyle report + Check that testIndividualReportsNotGeneratedByDashboard has a link to the checkstyle report + + + Check that testIndividualReportsGeneratedByDashboard has no link to the checkstyle report + 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/subproject3/.cvsignore b/dashboard/src/plugin-test/subproject3/.cvsignore deleted file mode 100644 index 5d21c883..00000000 --- a/dashboard/src/plugin-test/subproject3/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -target -maven.log diff --git a/dashboard/src/plugin-test/subproject3/project.properties b/dashboard/src/plugin-test/subproject3/project.properties deleted file mode 100644 index d66f96c3..00000000 --- a/dashboard/src/plugin-test/subproject3/project.properties +++ /dev/null @@ -1,19 +0,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. -# ------------------------------------------------------------------- - -# ------------------------------------------------------------------- -# P R O J E C T P R O P E R T I E S -# ------------------------------------------------------------------- diff --git a/dashboard/src/plugin-test/subproject3/project.xml b/dashboard/src/plugin-test/subproject3/project.xml deleted file mode 100644 index 298720dc..00000000 --- a/dashboard/src/plugin-test/subproject3/project.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - ${basedir}/../common/project.xml - test-maven-dashboard-plugin-subproject3 - Maven Dashboard plugin test - Subproject3 - - maven-changes-plugin - maven-tasklist-plugin - maven-linkcheck-plugin - maven-javadoc-plugin - maven-jxr-plugin - maven-jdepend-plugin - maven-checkstyle-plugin - maven-junit-report-plugin - - diff --git a/dashboard/src/plugin-test/subproject2/.cvsignore b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/.cvsignore similarity index 100% rename from dashboard/src/plugin-test/subproject2/.cvsignore rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/.cvsignore diff --git a/dashboard/src/plugin-test/subproject2/project.properties b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.properties similarity index 100% rename from dashboard/src/plugin-test/subproject2/project.properties rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.properties diff --git a/dashboard/src/plugin-test/subproject2/project.xml b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml similarity index 91% rename from dashboard/src/plugin-test/subproject2/project.xml rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml index 11bda6d6..a164b54e 100644 --- a/dashboard/src/plugin-test/subproject2/project.xml +++ b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml @@ -19,8 +19,8 @@ ${basedir}/../common/project.xml - test-maven-dashboard-plugin-subproject2 - Maven Dashboard plugin test - Subproject2 + testIndividualReportsGeneratedByDashboard + Test Individual Reports Generated By Dashboard