From d228fadfa0c0cc7284d4920c9bb485049ff3f68f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 26 May 2015 23:24:27 +0200 Subject: [PATCH] SONAR-6370 move server extensions out of core plugin --- plugins/sonar-core-plugin/pom.xml | 33 ------- .../org/sonar/plugins/core/CorePlugin.java | 87 +------------------ .../core/widgets/issues/package-info.java | 23 ----- .../core/widgets/measures/package-info.java | 23 ----- .../plugins/core/widgets/package-info.java | 23 ----- server/sonar-server/pom.xml | 19 +++- .../server}/charts/DistributionAreaChart.java | 2 +- .../server}/charts/DistributionBarChart.java | 2 +- .../server/dashboard/db/DashboardDao.java | 5 +- .../sonar/server/dashboard/db/WidgetDao.java | 3 +- .../dashboard/db/WidgetPropertyDao.java | 7 +- .../server/dashboard/db/package-info.java | 1 + .../sonar/server/dashboard/package-info.java | 1 + .../template}/GlobalDefaultDashboard.java | 12 +-- .../template}/ProjectDefaultDashboard.java | 2 +- .../template}/ProjectIssuesDashboard.java | 4 +- .../ProjectTimeMachineDashboard.java | 4 +- .../dashboard/template}/package-info.java | 3 +- .../dashboard/widget}/ActionPlansWidget.java | 5 +- .../dashboard/widget}/AlertsWidget.java | 10 ++- .../dashboard/widget}/BubbleChartWidget.java | 4 +- .../dashboard/widget}/ComplexityWidget.java | 4 +- .../server/dashboard/widget}/CoreWidget.java | 2 +- .../dashboard/widget}/CoverageWidget.java | 4 +- .../widget}/CustomMeasuresWidget.java | 4 +- .../dashboard/widget}/DebtOverviewWidget.java | 4 +- .../dashboard/widget}/DescriptionWidget.java | 4 +- .../widget}/DocumentationCommentsWidget.java | 5 +- .../dashboard/widget}/DuplicationsWidget.java | 4 +- .../dashboard/widget}/EventsWidget.java | 4 +- .../widget}/HotspotMetricWidget.java | 12 +-- .../dashboard/widget}/IssueFilterWidget.java | 15 ++-- .../widget}/IssueTagCloudWidget.java | 5 +- .../dashboard/widget}/IssuesWidget.java | 5 +- .../dashboard/widget}/ItCoverageWidget.java | 4 +- .../MeasureFilterAsBubbleChartWidget.java | 12 +-- .../widget}/MeasureFilterAsCloudWidget.java | 14 +-- .../MeasureFilterAsHistogramWidget.java | 12 +-- .../MeasureFilterAsPieChartWidget.java | 12 +-- .../widget}/MeasureFilterAsTreemapWidget.java | 6 +- .../widget}/MeasureFilterListWidget.java | 11 ++- .../widget}/ProjectFileCloudWidget.java | 4 +- .../widget}/ProjectIssueFilterWidget.java | 15 ++-- .../server/dashboard/widget}/SizeWidget.java | 4 +- .../widget}/TechnicalDebtPyramidWidget.java | 4 +- .../dashboard/widget}/TimeMachineWidget.java | 4 +- .../dashboard/widget}/TimelineWidget.java | 16 ++-- .../dashboard/widget}/TreemapWidget.java | 4 +- .../dashboard/widget}/WelcomeWidget.java | 4 +- .../dashboard/widget}/WidgetConstants.java | 2 +- .../dashboard/widget}/package-info.java | 3 +- .../sonar/server/dashboard/ws/ShowAction.java | 3 +- .../server/dashboard/ws/package-info.java | 1 + .../measure/template}/MyFavouritesFilter.java | 2 +- .../measure/template}/ProjectFilter.java | 2 +- .../measure/template}/package-info.java | 2 +- .../platformlevel/PlatformLevel4.java | 76 ++++++++++++++++ .../widget}/_complexity_chart.html.erb | 0 .../dashboard/widget}/action_plans.html.erb | 0 .../server/dashboard/widget}/alerts.html.erb | 0 .../dashboard/widget}/bubbleChart.html.erb | 0 .../dashboard/widget}/complexity.html.erb | 0 .../dashboard/widget}/coverage.html.erb | 0 .../widget}/custom_measures.html.erb | 0 .../dashboard/widget}/debt_overview.erb | 0 .../dashboard/widget}/description.html.erb | 0 .../documentation_comments_widget.html.erb | 0 .../widget}/duplications_widget.html.erb | 0 .../server/dashboard/widget}/events.html.erb | 0 .../dashboard/widget}/hotspot_metric.html.erb | 0 .../dashboard/widget}/issue_filter.html.erb | 0 .../widget}/issue_tag_cloud.html.erb | 0 .../server/dashboard/widget}/issues.html.erb | 0 .../dashboard/widget}/it_coverage.html.erb | 0 .../measure_filter_bubble_chart.html.erb | 0 .../widget}/measure_filter_cloud.html.erb | 0 .../widget}/measure_filter_histogram.html.erb | 0 .../widget}/measure_filter_list.html.erb | 0 .../widget}/measure_filter_pie_chart.html.erb | 0 .../widget}/measure_filter_treemap.html.erb | 0 .../widget}/project_file_cloud.html.erb | 0 .../widget}/project_issue_filter.html.erb | 0 .../server/dashboard/widget}/size.html.erb | 0 .../widget}/technical_debt_pyramid.html.erb | 0 .../dashboard/widget}/time_machine.html.erb | 0 .../dashboard/widget}/timeline.html.erb | 0 .../server/dashboard/widget}/treemap.html.erb | 0 .../server/dashboard/widget}/welcome.html.erb | 0 .../server}/charts/AbstractChartTest.java | 2 +- .../charts/DistributionAreaChartTest.java | 2 +- .../charts/DistributionBarChartTest.java | 2 +- .../template}/GlobalDefaultDashboardTest.java | 25 ++---- .../ProjectDefaultDashboardTest.java | 8 +- .../template}/ProjectIssuesDashboardTest.java | 8 +- .../ProjectTimeMachineDashboardTest.java | 8 +- .../dashboard/widget}/CoreWidgetsTest.java | 27 ++---- .../template}/MyFavouritesFilterTest.java | 8 +- .../measure/template}/ProjectFilterTest.java | 8 +- .../ProjectIssuesDashboardTest/filters.xml | 0 99 files changed, 267 insertions(+), 393 deletions(-) delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/package-info.java delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/package-info.java delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/package-info.java rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core => server/sonar-server/src/main/java/org/sonar/server}/charts/DistributionAreaChart.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core => server/sonar-server/src/main/java/org/sonar/server}/charts/DistributionBarChart.java (99%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/main/java/org/sonar/server/dashboard/template}/GlobalDefaultDashboard.java (88%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/main/java/org/sonar/server/dashboard/template}/ProjectDefaultDashboard.java (97%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/main/java/org/sonar/server/dashboard/template}/ProjectIssuesDashboard.java (96%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/main/java/org/sonar/server/dashboard/template}/ProjectTimeMachineDashboard.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/main/java/org/sonar/server/dashboard/template}/package-info.java (95%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/ActionPlansWidget.java (86%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/AlertsWidget.java (76%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/BubbleChartWidget.java (95%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/ComplexityWidget.java (87%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/CoreWidget.java (97%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/CoverageWidget.java (88%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/CustomMeasuresWidget.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/DebtOverviewWidget.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/DescriptionWidget.java (88%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/DocumentationCommentsWidget.java (89%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/DuplicationsWidget.java (86%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/EventsWidget.java (88%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/HotspotMetricWidget.java (69%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/IssueFilterWidget.java (77%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/IssueTagCloudWidget.java (86%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/IssuesWidget.java (83%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/ItCoverageWidget.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterAsBubbleChartWidget.java (86%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterAsCloudWidget.java (81%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterAsHistogramWidget.java (84%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterAsPieChartWidget.java (86%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterAsTreemapWidget.java (91%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/MeasureFilterListWidget.java (83%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/ProjectFileCloudWidget.java (94%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/ProjectIssueFilterWidget.java (77%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/SizeWidget.java (88%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/TechnicalDebtPyramidWidget.java (91%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/TimeMachineWidget.java (94%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/TimelineWidget.java (60%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/TreemapWidget.java (95%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/WelcomeWidget.java (90%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/WidgetConstants.java (96%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts => server/sonar-server/src/main/java/org/sonar/server/dashboard/widget}/package-info.java (95%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters => server/sonar-server/src/main/java/org/sonar/server/measure/template}/MyFavouritesFilter.java (97%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters => server/sonar-server/src/main/java/org/sonar/server/measure/template}/ProjectFilter.java (97%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters => server/sonar-server/src/main/java/org/sonar/server/measure/template}/package-info.java (95%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/_complexity_chart.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/action_plans.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/alerts.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/bubbleChart.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/complexity.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/coverage.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/custom_measures.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/debt_overview.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/description.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/documentation_comments_widget.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/duplications_widget.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/events.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/hotspot_metric.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/issue_filter.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/issue_tag_cloud.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/issues.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/it_coverage.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_bubble_chart.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_cloud.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_histogram.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_list.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_pie_chart.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/measure_filter_treemap.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/project_file_cloud.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/project_issue_filter.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/size.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/technical_debt_pyramid.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/time_machine.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/timeline.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/treemap.html.erb (100%) rename {plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets => server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget}/welcome.html.erb (100%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core => server/sonar-server/src/test/java/org/sonar/server}/charts/AbstractChartTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core => server/sonar-server/src/test/java/org/sonar/server}/charts/DistributionAreaChartTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core => server/sonar-server/src/test/java/org/sonar/server}/charts/DistributionBarChartTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/test/java/org/sonar/server/dashboard/template}/GlobalDefaultDashboardTest.java (85%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/test/java/org/sonar/server/dashboard/template}/ProjectDefaultDashboardTest.java (86%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/test/java/org/sonar/server/dashboard/template}/ProjectIssuesDashboardTest.java (90%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards => server/sonar-server/src/test/java/org/sonar/server/dashboard/template}/ProjectTimeMachineDashboardTest.java (88%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets => server/sonar-server/src/test/java/org/sonar/server/dashboard/widget}/CoreWidgetsTest.java (85%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters => server/sonar-server/src/test/java/org/sonar/server/measure/template}/MyFavouritesFilterTest.java (85%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters => server/sonar-server/src/test/java/org/sonar/server/measure/template}/ProjectFilterTest.java (85%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/dashboards => server/sonar-server/src/test/resources/org/sonar/server/dashboard/template}/ProjectIssuesDashboardTest/filters.xml (100%) diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index f81408953c1..3df82a92539 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -68,11 +68,6 @@ mockito-core test - - org.reflections - reflections - test - org.dbunit dbunit @@ -100,35 +95,7 @@ - - - ${basedir}/src/main/resources - - - ${basedir}/src/test/resources - - - - - org.codehaus.sonar - sonar-dev-maven-plugin - - - trim - process-resources - - trim - - - ${project.build.outputDirectory} - - **/*.erb - - - - - org.codehaus.sonar sonar-packaging-maven-plugin diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index 7a6fdb979a2..0b1883d954b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -20,21 +20,14 @@ package org.sonar.plugins.core; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.Properties; import org.sonar.api.Property; import org.sonar.api.PropertyType; import org.sonar.api.SonarPlugin; -import org.sonar.plugins.core.charts.DistributionAreaChart; -import org.sonar.plugins.core.charts.DistributionBarChart; -import org.sonar.plugins.core.dashboards.GlobalDefaultDashboard; -import org.sonar.plugins.core.dashboards.ProjectDefaultDashboard; -import org.sonar.plugins.core.dashboards.ProjectIssuesDashboard; -import org.sonar.plugins.core.dashboards.ProjectTimeMachineDashboard; import org.sonar.plugins.core.issue.CountFalsePositivesDecorator; import org.sonar.plugins.core.issue.CountUnresolvedIssuesDecorator; -import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; -import org.sonar.plugins.core.measurefilters.ProjectFilter; import org.sonar.plugins.core.notifications.alerts.NewAlerts; import org.sonar.plugins.core.security.ApplyProjectRolesDecorator; import org.sonar.plugins.core.sensors.BranchCoverageDecorator; @@ -57,38 +50,6 @@ import org.sonar.plugins.core.timemachine.NewItCoverageFileAnalyzer; import org.sonar.plugins.core.timemachine.NewOverallCoverageFileAnalyzer; import org.sonar.plugins.core.timemachine.TimeMachineConfigurationPersister; import org.sonar.plugins.core.timemachine.VariationDecorator; -import org.sonar.plugins.core.widgets.AlertsWidget; -import org.sonar.plugins.core.widgets.BubbleChartWidget; -import org.sonar.plugins.core.widgets.ComplexityWidget; -import org.sonar.plugins.core.widgets.CoverageWidget; -import org.sonar.plugins.core.widgets.CustomMeasuresWidget; -import org.sonar.plugins.core.widgets.DebtOverviewWidget; -import org.sonar.plugins.core.widgets.DescriptionWidget; -import org.sonar.plugins.core.widgets.DocumentationCommentsWidget; -import org.sonar.plugins.core.widgets.DuplicationsWidget; -import org.sonar.plugins.core.widgets.EventsWidget; -import org.sonar.plugins.core.widgets.HotspotMetricWidget; -import org.sonar.plugins.core.widgets.ItCoverageWidget; -import org.sonar.plugins.core.widgets.ProjectFileCloudWidget; -import org.sonar.plugins.core.widgets.SizeWidget; -import org.sonar.plugins.core.widgets.TechnicalDebtPyramidWidget; -import org.sonar.plugins.core.widgets.TimeMachineWidget; -import org.sonar.plugins.core.widgets.TimelineWidget; -import org.sonar.plugins.core.widgets.TreemapWidget; -import org.sonar.plugins.core.widgets.WelcomeWidget; -import org.sonar.plugins.core.widgets.issues.ActionPlansWidget; -import org.sonar.plugins.core.widgets.issues.IssueFilterWidget; -import org.sonar.plugins.core.widgets.issues.IssueTagCloudWidget; -import org.sonar.plugins.core.widgets.issues.IssuesWidget; -import org.sonar.plugins.core.widgets.issues.ProjectIssueFilterWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsBubbleChartWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsCloudWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsHistogramWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsPieChartWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsTreemapWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterListWidget; - -import java.util.List; @Properties({ @Property( @@ -258,55 +219,9 @@ public final class CorePlugin extends SonarPlugin { DefaultResourceTypes.class, UserManagedMetrics.class, - // measure filters - ProjectFilter.class, - MyFavouritesFilter.class, - - // widgets - AlertsWidget.class, - CoverageWidget.class, - ItCoverageWidget.class, - DescriptionWidget.class, - ComplexityWidget.class, - IssuesWidget.class, - SizeWidget.class, - EventsWidget.class, - CustomMeasuresWidget.class, - TimelineWidget.class, - BubbleChartWidget.class, - TimeMachineWidget.class, - HotspotMetricWidget.class, - TreemapWidget.class, - MeasureFilterListWidget.class, - MeasureFilterAsTreemapWidget.class, - WelcomeWidget.class, - DocumentationCommentsWidget.class, - DuplicationsWidget.class, - TechnicalDebtPyramidWidget.class, - MeasureFilterAsPieChartWidget.class, - MeasureFilterAsCloudWidget.class, - MeasureFilterAsHistogramWidget.class, - MeasureFilterAsBubbleChartWidget.class, - ProjectFileCloudWidget.class, - DebtOverviewWidget.class, - - // dashboards - ProjectDefaultDashboard.class, - ProjectIssuesDashboard.class, - ProjectTimeMachineDashboard.class, - GlobalDefaultDashboard.class, - - // chart - DistributionBarChart.class, - DistributionAreaChart.class, - // issues CountUnresolvedIssuesDecorator.class, CountFalsePositivesDecorator.class, - ActionPlansWidget.class, - IssueFilterWidget.class, - ProjectIssueFilterWidget.class, - IssueTagCloudWidget.class, // batch UnitTestDecorator.class, diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/package-info.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/package-info.java deleted file mode 100644 index 528f5fa3dae..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.plugins.core.widgets.issues; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/package-info.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/package-info.java deleted file mode 100644 index d781bea9c69..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.plugins.core.widgets.measures; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/package-info.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/package-info.java deleted file mode 100644 index dc52f477867..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.plugins.core.widgets; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml index d7eee268b0c..00b38ab5674 100644 --- a/server/sonar-server/pom.xml +++ b/server/sonar-server/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.codehaus.sonar @@ -220,6 +221,11 @@ ${project.version} test + + org.reflections + reflections + test + @@ -227,8 +233,17 @@ src/main/resources true + + build.properties + + + + src/main/resources + false + + build.properties + - diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionAreaChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/DistributionAreaChart.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionAreaChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/DistributionAreaChart.java index 3687c85df9a..31e02d1df36 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionAreaChart.java +++ b/server/sonar-server/src/main/java/org/sonar/server/charts/DistributionAreaChart.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.charts; +package org.sonar.server.charts; import org.apache.commons.lang.StringUtils; import org.jfree.chart.axis.CategoryAxis; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionBarChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/DistributionBarChart.java similarity index 99% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionBarChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/DistributionBarChart.java index ef021132555..80cfb64d927 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/DistributionBarChart.java +++ b/server/sonar-server/src/main/java/org/sonar/server/charts/DistributionBarChart.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.charts; +package org.sonar.server.charts; import org.apache.commons.lang.StringUtils; import org.jfree.chart.axis.CategoryAxis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java index 3869ffb3b87..127aeac10ce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java @@ -19,14 +19,13 @@ */ package org.sonar.server.dashboard.db; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.sonar.core.dashboard.DashboardDto; import org.sonar.core.dashboard.DashboardMapper; import org.sonar.core.persistence.DaoComponent; import org.sonar.core.persistence.DbSession; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - public class DashboardDao implements DaoComponent { @CheckForNull diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java index 3b3c6476fbd..5bc77ce1fe3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java @@ -19,14 +19,13 @@ */ package org.sonar.server.dashboard.db; +import java.util.Collection; import org.sonar.core.dashboard.WidgetDto; import org.sonar.core.dashboard.WidgetMapper; import org.sonar.core.persistence.DaoComponent; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import java.util.Collection; - public class WidgetDao implements DaoComponent { private MyBatis myBatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java index 46ec46113b8..9ac498ebc24 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java @@ -20,6 +20,9 @@ package org.sonar.server.dashboard.db; import com.google.common.base.Function; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import org.sonar.core.dashboard.WidgetPropertyDto; import org.sonar.core.dashboard.WidgetPropertyMapper; import org.sonar.core.persistence.DaoComponent; @@ -27,10 +30,6 @@ import org.sonar.core.persistence.DaoUtils; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - public class WidgetPropertyDao implements DaoComponent { private final MyBatis myBatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/package-info.java index ce41e8799be..ab56dedec78 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/package-info.java @@ -21,3 +21,4 @@ package org.sonar.server.dashboard.db; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/package-info.java index 93024b8dc6d..2343d18367d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/package-info.java @@ -21,3 +21,4 @@ package org.sonar.server.dashboard; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java index 5e204b18537..708b45e6f2c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; import org.sonar.core.measure.db.MeasureFilterDao; import org.sonar.core.measure.db.MeasureFilterDto; -import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; -import org.sonar.plugins.core.measurefilters.ProjectFilter; -import org.sonar.plugins.core.widgets.WelcomeWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsTreemapWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterListWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsTreemapWidget; +import org.sonar.server.dashboard.widget.MeasureFilterListWidget; +import org.sonar.server.dashboard.widget.WelcomeWidget; +import org.sonar.server.measure.template.MyFavouritesFilter; +import org.sonar.server.measure.template.ProjectFilter; /** * Projects global dashboard for Sonar diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectDefaultDashboard.java similarity index 97% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectDefaultDashboard.java index 61d88fa3f59..7f022ea37a2 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectDefaultDashboard.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java similarity index 96% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java index 810211751ad..405098f7f72 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import com.google.common.base.Preconditions; import org.sonar.api.web.Dashboard; @@ -25,7 +25,7 @@ import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; import org.sonar.core.issue.db.IssueFilterDao; import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.plugins.core.widgets.issues.ProjectIssueFilterWidget; +import org.sonar.server.dashboard.widget.ProjectIssueFilterWidget; /** * Issues dashboard for Sonar diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboard.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboard.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboard.java index e0024db1509..f34b456cb94 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboard.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboard.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.Dashboard; @@ -26,7 +26,7 @@ import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; /** - * Time Machine dashboard for Sonar + * Time Machine dashboard * * @since 3.0 */ diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/package-info.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/template/package-info.java index d901586ae25..0326d785bd4 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/package-info.java @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ActionPlansWidget.java similarity index 86% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ActionPlansWidget.java index e2bee019b6f..cd42eaeaf05 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ActionPlansWidget.java @@ -17,13 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.issues; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; import org.sonar.api.web.WidgetPropertyType; -import org.sonar.plugins.core.widgets.CoreWidget; @WidgetCategory({"Issues"}) @WidgetProperties({ @@ -31,6 +30,6 @@ import org.sonar.plugins.core.widgets.CoreWidget; }) public class ActionPlansWidget extends CoreWidget { public ActionPlansWidget() { - super("action_plans", "Issues action plans", "/org/sonar/plugins/core/widgets/issues/action_plans.html.erb"); + super("action_plans", "Issues action plans", "/org/sonar/server/dashboard/widget/action_plans.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AlertsWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/AlertsWidget.java similarity index 76% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AlertsWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/AlertsWidget.java index c794e898573..2394a054de0 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AlertsWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/AlertsWidget.java @@ -17,9 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; -import org.sonar.api.web.*; +import org.sonar.api.web.WidgetLayout; +import org.sonar.api.web.WidgetLayoutType; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; @WidgetProperties({ @WidgetProperty(key = "show_ok", type = WidgetPropertyType.BOOLEAN, defaultValue = "false"), @@ -28,7 +32,7 @@ import org.sonar.api.web.*; public class AlertsWidget extends CoreWidget { public AlertsWidget() { - super("alerts", "Alerts", "/org/sonar/plugins/core/widgets/alerts.html.erb"); + super("alerts", "Alerts", "/org/sonar/server/dashboard/widget/alerts.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/BubbleChartWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/BubbleChartWidget.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/BubbleChartWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/BubbleChartWidget.java index f583d6e24ea..dbab080abe0 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/BubbleChartWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/BubbleChartWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.WidgetProperties; @@ -35,6 +35,6 @@ import org.sonar.api.web.WidgetPropertyType; }) public class BubbleChartWidget extends CoreWidget { public BubbleChartWidget() { - super("bubble_chart", "Project File Bubble Chart", "/org/sonar/plugins/core/widgets/bubbleChart.html.erb"); + super("bubble_chart", "Project File Bubble Chart", "/org/sonar/server/dashboard/widget/bubbleChart.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ComplexityWidget.java similarity index 87% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ComplexityWidget.java index d04a79d5249..84c51bf828a 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ComplexityWidget.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; public class ComplexityWidget extends CoreWidget { public ComplexityWidget() { - super("complexity", "Complexity", "/org/sonar/plugins/core/widgets/complexity.html.erb"); + super("complexity", "Complexity", "/org/sonar/server/dashboard/widget/complexity.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoreWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoreWidget.java similarity index 97% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoreWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoreWidget.java index f01a23a57cc..7db3f4775c9 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoreWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoreWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.AbstractRubyTemplate; import org.sonar.api.web.RubyRailsWidget; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoverageWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoverageWidget.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoverageWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoverageWidget.java index 273487dbca5..951f96e467d 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CoverageWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CoverageWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.UserRole; import org.sonar.api.web.WidgetCategory; @@ -27,6 +27,6 @@ import org.sonar.api.web.WidgetCategory; public class CoverageWidget extends CoreWidget { public CoverageWidget() { - super("code_coverage", "Code coverage", "/org/sonar/plugins/core/widgets/coverage.html.erb"); + super("code_coverage", "Code coverage", "/org/sonar/server/dashboard/widget/coverage.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CustomMeasuresWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CustomMeasuresWidget.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CustomMeasuresWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CustomMeasuresWidget.java index d8b149c8422..9ab2e89ec27 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CustomMeasuresWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/CustomMeasuresWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; @@ -37,6 +37,6 @@ import org.sonar.api.web.WidgetPropertyType; }) public class CustomMeasuresWidget extends CoreWidget { public CustomMeasuresWidget() { - super("custom_measures", "Custom Measures", "/org/sonar/plugins/core/widgets/custom_measures.html.erb"); + super("custom_measures", "Custom Measures", "/org/sonar/server/dashboard/widget/custom_measures.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DebtOverviewWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DebtOverviewWidget.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DebtOverviewWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DebtOverviewWidget.java index 9af75bbbdd3..ea7ff617af9 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DebtOverviewWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DebtOverviewWidget.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.UserRole; import org.sonar.api.web.WidgetCategory; @@ -28,6 +28,6 @@ import org.sonar.api.web.WidgetCategory; public final class DebtOverviewWidget extends CoreWidget { public DebtOverviewWidget() { - super("debt_overview", "Technical Debt Overview", "/org/sonar/plugins/core/widgets/debt_overview.erb"); + super("debt_overview", "Technical Debt Overview", "/org/sonar/server/dashboard/widget/debt_overview.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DescriptionWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DescriptionWidget.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DescriptionWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DescriptionWidget.java index 89baad496c4..4f9689582cf 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DescriptionWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DescriptionWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetLayout; import org.sonar.api.web.WidgetLayoutType; @@ -26,6 +26,6 @@ import org.sonar.api.web.WidgetLayoutType; public class DescriptionWidget extends CoreWidget { public DescriptionWidget() { - super("description", "Description", "/org/sonar/plugins/core/widgets/description.html.erb"); + super("description", "Description", "/org/sonar/server/dashboard/widget/description.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DocumentationCommentsWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DocumentationCommentsWidget.java similarity index 89% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DocumentationCommentsWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DocumentationCommentsWidget.java index 38a6a50a2a4..40d71e2c43c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DocumentationCommentsWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DocumentationCommentsWidget.java @@ -17,13 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; - +package org.sonar.server.dashboard.widget; public class DocumentationCommentsWidget extends CoreWidget { public DocumentationCommentsWidget() { - super("documentation_comments", "Documentation Metrics", "/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb"); + super("documentation_comments", "Documentation Metrics", "/org/sonar/server/dashboard/widget/documentation_comments_widget.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DuplicationsWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DuplicationsWidget.java similarity index 86% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DuplicationsWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DuplicationsWidget.java index 30371c07a2b..de161b8e3cf 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DuplicationsWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/DuplicationsWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; /** * @author Patroklos PAPAPETROU @@ -26,7 +26,7 @@ package org.sonar.plugins.core.widgets; public class DuplicationsWidget extends CoreWidget { public DuplicationsWidget() { - super("duplications", "Duplications", "/org/sonar/plugins/core/widgets/duplications_widget.html.erb"); + super("duplications", "Duplications", "/org/sonar/server/dashboard/widget/duplications_widget.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/EventsWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/EventsWidget.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/EventsWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/EventsWidget.java index 8cf081d045b..c9a8b398a80 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/EventsWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/EventsWidget.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; public class EventsWidget extends CoreWidget { public EventsWidget() { - super("events", "Events", "/org/sonar/plugins/core/widgets/events.html.erb"); + super("events", "Events", "/org/sonar/server/dashboard/widget/events.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/HotspotMetricWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/HotspotMetricWidget.java similarity index 69% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/HotspotMetricWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/HotspotMetricWidget.java index 11986e6f558..a13cb4d4a7d 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/HotspotMetricWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/HotspotMetricWidget.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; import org.sonar.api.web.WidgetPropertyType; -@WidgetCategory({ "Hotspots" }) +@WidgetCategory({"Hotspots"}) @WidgetProperties({ - @WidgetProperty(key = "title", type = WidgetPropertyType.STRING), - @WidgetProperty(key = "metric", type = WidgetPropertyType.METRIC, defaultValue = "ncloc", options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), - @WidgetProperty(key = "numberOfLines", type = WidgetPropertyType.INTEGER, defaultValue = "5") + @WidgetProperty(key = "title", type = WidgetPropertyType.STRING), + @WidgetProperty(key = "metric", type = WidgetPropertyType.METRIC, defaultValue = "ncloc", options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), + @WidgetProperty(key = "numberOfLines", type = WidgetPropertyType.INTEGER, defaultValue = "5") }) public class HotspotMetricWidget extends CoreWidget { public HotspotMetricWidget() { - super("hotspot_metric", "Metric hotspot", "/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb"); + super("hotspot_metric", "Metric hotspot", "/org/sonar/server/dashboard/widget/hotspot_metric.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java similarity index 77% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueFilterWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java index f02fda9677d..d3bc92a44a5 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java @@ -17,10 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.issues; +package org.sonar.server.dashboard.widget; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -29,8 +32,8 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; @WidgetProperties({ @WidgetProperty(key = IssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = IssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", - options = {"severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters", - "authors", "languages", "actionPlans", "createdAt"}), + options = {"severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters", + "authors", "languages", "actionPlans", "createdAt"}), @WidgetProperty(key = IssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false") }) public class IssueFilterWidget extends CoreWidget { @@ -41,6 +44,6 @@ public class IssueFilterWidget extends CoreWidget { public static final String ID = "issue_filter"; public IssueFilterWidget() { - super(ID, "Issue Filter", "/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb"); + super(ID, "Issue Filter", "/org/sonar/server/dashboard/widget/issue_filter.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueTagCloudWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueTagCloudWidget.java similarity index 86% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueTagCloudWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueTagCloudWidget.java index cba0aa3f835..60fde54c082 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssueTagCloudWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueTagCloudWidget.java @@ -17,14 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.issues; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; import org.sonar.api.web.WidgetPropertyType; import org.sonar.api.web.WidgetScope; -import org.sonar.plugins.core.widgets.CoreWidget; import static org.sonar.api.web.WidgetScope.PROJECT; @@ -36,7 +35,7 @@ import static org.sonar.api.web.WidgetScope.PROJECT; public class IssueTagCloudWidget extends CoreWidget { public IssueTagCloudWidget() { - super("issue_tag_cloud", "Issue Tag Cloud", "/org/sonar/plugins/core/widgets/issues/issue_tag_cloud.html.erb"); + super("issue_tag_cloud", "Issue Tag Cloud", "/org/sonar/server/dashboard/widget/issue_tag_cloud.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssuesWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java similarity index 83% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssuesWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java index f92d9ab4e73..9b035643f27 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/IssuesWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java @@ -17,15 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.issues; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; -import org.sonar.plugins.core.widgets.CoreWidget; @WidgetCategory({"Issues", "Technical Debt"}) public class IssuesWidget extends CoreWidget { public IssuesWidget() { - super("rules", "Issues and Technical Debt", "/org/sonar/plugins/core/widgets/issues/issues.html.erb"); + super("rules", "Issues and Technical Debt", "/org/sonar/server/dashboard/widget/issues.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ItCoverageWidget.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ItCoverageWidget.java index 98f438751c0..cb3b0eea262 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ItCoverageWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.UserRole; import org.sonar.api.web.WidgetCategory; @@ -27,6 +27,6 @@ import org.sonar.api.web.WidgetCategory; public class ItCoverageWidget extends CoreWidget { public ItCoverageWidget() { - super("it-coverage", "Integration Test Coverage", "/org/sonar/plugins/core/widgets/it_coverage.html.erb"); + super("it-coverage", "Integration Test Coverage", "/org/sonar/server/dashboard/widget/it_coverage.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsBubbleChartWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsBubbleChartWidget.java similarity index 86% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsBubbleChartWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsBubbleChartWidget.java index bac50919643..9d8f1cee819 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsBubbleChartWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsBubbleChartWidget.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -42,7 +44,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; public class MeasureFilterAsBubbleChartWidget extends CoreWidget { public MeasureFilterAsBubbleChartWidget() { - super("measure_filter_bubble_chart", "Measure Filter as Bubble Chart", "/org/sonar/plugins/core/widgets/measures/measure_filter_bubble_chart.html.erb"); + super("measure_filter_bubble_chart", "Measure Filter as Bubble Chart", "/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsCloudWidget.java similarity index 81% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsCloudWidget.java index 9bb13aa4225..c148c4a5bb1 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsCloudWidget.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -33,13 +35,13 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; @WidgetProperty(key = "chartTitle", type = WidgetPropertyType.STRING), @WidgetProperty(key = "sizeMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COMPLEXITY_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), @WidgetProperty(key = "colorMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COVERAGE_KEY, - options = { WidgetConstants.FILTER_OUT_NEW_METRICS, "type:PERCENT" }), + options = {WidgetConstants.FILTER_OUT_NEW_METRICS, "type:PERCENT"}), @WidgetProperty(key = "maxItems", type = WidgetPropertyType.INTEGER, defaultValue = "100") }) public class MeasureFilterAsCloudWidget extends CoreWidget { public MeasureFilterAsCloudWidget() { - super("measure_filter_cloud", "Measure Filter as Cloud", "/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb"); + super("measure_filter_cloud", "Measure Filter as Cloud", "/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsHistogramWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsHistogramWidget.java similarity index 84% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsHistogramWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsHistogramWidget.java index 8dafd420381..6341a1e2ed6 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsHistogramWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsHistogramWidget.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -39,7 +41,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; public class MeasureFilterAsHistogramWidget extends CoreWidget { public MeasureFilterAsHistogramWidget() { - super("measure_filter_histogram", "Measure Filter as Histogram", "/org/sonar/plugins/core/widgets/measures/measure_filter_histogram.html.erb"); + super("measure_filter_histogram", "Measure Filter as Histogram", "/org/sonar/server/dashboard/widget/measure_filter_histogram.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsPieChartWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsPieChartWidget.java similarity index 86% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsPieChartWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsPieChartWidget.java index f3a057b4fe9..c32565f3e3b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsPieChartWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsPieChartWidget.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -40,7 +42,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; public class MeasureFilterAsPieChartWidget extends CoreWidget { public MeasureFilterAsPieChartWidget() { - super("measure_filter_pie_chart", "Measure Filter as Donut Chart", "/org/sonar/plugins/core/widgets/measures/measure_filter_pie_chart.html.erb"); + super("measure_filter_pie_chart", "Measure Filter as Donut Chart", "/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsTreemapWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsTreemapWidget.java similarity index 91% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsTreemapWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsTreemapWidget.java index ba0c06d891a..3eb4c9f5895 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsTreemapWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterAsTreemapWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.WidgetCategory; @@ -25,8 +25,6 @@ import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; import org.sonar.api.web.WidgetPropertyType; import org.sonar.api.web.WidgetScope; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -56,6 +54,6 @@ public class MeasureFilterAsTreemapWidget extends CoreWidget { public static final String ID = "measure_filter_treemap"; public MeasureFilterAsTreemapWidget() { - super(ID, "Measure Filter as Treemap", "/org/sonar/plugins/core/widgets/measures/measure_filter_treemap.html.erb"); + super(ID, "Measure Filter as Treemap", "/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterListWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterListWidget.java similarity index 83% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterListWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterListWidget.java index e8b3eaf583a..24d4a1831e0 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterListWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/MeasureFilterListWidget.java @@ -17,10 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.measures; +package org.sonar.server.dashboard.widget; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.GLOBAL; @@ -38,6 +41,6 @@ public class MeasureFilterListWidget extends CoreWidget { public static final String ID = "measure_filter_list"; public MeasureFilterListWidget() { - super(ID, "Measure Filter as List", "/org/sonar/plugins/core/widgets/measure_filter_list.html.erb"); + super(ID, "Measure Filter as List", "/org/sonar/server/dashboard/widget/measure_filter_list.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectFileCloudWidget.java similarity index 94% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectFileCloudWidget.java index f712e68b0a1..616267d5841 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectFileCloudWidget.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.WidgetProperties; @@ -33,6 +33,6 @@ import org.sonar.api.web.WidgetPropertyType; }) public class ProjectFileCloudWidget extends CoreWidget { public ProjectFileCloudWidget() { - super("project_file_cloud", "Project File Word Cloud", "/org/sonar/plugins/core/widgets/project_file_cloud.html.erb"); + super("project_file_cloud", "Project File Word Cloud", "/org/sonar/server/dashboard/widget/project_file_cloud.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ProjectIssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java similarity index 77% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ProjectIssueFilterWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java index 5e45af9272a..3f4f1ff9275 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ProjectIssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java @@ -17,10 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets.issues; +package org.sonar.server.dashboard.widget; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; +import org.sonar.api.web.WidgetCategory; +import org.sonar.api.web.WidgetProperties; +import org.sonar.api.web.WidgetProperty; +import org.sonar.api.web.WidgetPropertyType; +import org.sonar.api.web.WidgetScope; import static org.sonar.api.web.WidgetScope.PROJECT; @@ -29,8 +32,8 @@ import static org.sonar.api.web.WidgetScope.PROJECT; @WidgetProperties({ @WidgetProperty(key = ProjectIssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = ProjectIssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", - options = {"severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors", - "languages", "actionPlans", "createdAt"}), + options = {"severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors", + "languages", "actionPlans", "createdAt"}), @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false") }) public class ProjectIssueFilterWidget extends CoreWidget { @@ -41,6 +44,6 @@ public class ProjectIssueFilterWidget extends CoreWidget { public static final String ID = "project_issue_filter"; public ProjectIssueFilterWidget() { - super(ID, "Project Issue Filter", "/org/sonar/plugins/core/widgets/issues/project_issue_filter.html.erb"); + super(ID, "Project Issue Filter", "/org/sonar/server/dashboard/widget/project_issue_filter.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/SizeWidget.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/SizeWidget.java index b3330c7833f..e5b0db1df35 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/SizeWidget.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; public class SizeWidget extends CoreWidget { public SizeWidget() { - super("size", "Size metrics", "/org/sonar/plugins/core/widgets/size.html.erb"); + super("size", "Size metrics", "/org/sonar/server/dashboard/widget/size.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TechnicalDebtPyramidWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TechnicalDebtPyramidWidget.java similarity index 91% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TechnicalDebtPyramidWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TechnicalDebtPyramidWidget.java index d1c2bcf762c..1eb36c50460 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TechnicalDebtPyramidWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TechnicalDebtPyramidWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.UserRole; import org.sonar.api.web.WidgetCategory; @@ -27,6 +27,6 @@ import org.sonar.api.web.WidgetCategory; public final class TechnicalDebtPyramidWidget extends CoreWidget { public TechnicalDebtPyramidWidget() { - super("technical_debt_pyramid", "Technical Debt Pyramid", "/org/sonar/plugins/core/widgets/technical_debt_pyramid.html.erb"); + super("technical_debt_pyramid", "Technical Debt Pyramid", "/org/sonar/server/dashboard/widget/technical_debt_pyramid.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimeMachineWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimeMachineWidget.java similarity index 94% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimeMachineWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimeMachineWidget.java index 7a494b4ea5f..73f96bb2bd1 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimeMachineWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimeMachineWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; import org.sonar.api.web.WidgetProperties; @@ -42,6 +42,6 @@ import org.sonar.api.web.WidgetPropertyType; }) public class TimeMachineWidget extends CoreWidget { public TimeMachineWidget() { - super("time_machine", "History Table", "/org/sonar/plugins/core/widgets/time_machine.html.erb"); + super("time_machine", "History Table", "/org/sonar/server/dashboard/widget/time_machine.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimelineWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimelineWidget.java similarity index 60% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimelineWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimelineWidget.java index 26533d23f40..afe5c9eb842 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TimelineWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TimelineWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetCategory; import org.sonar.api.web.WidgetProperties; @@ -26,15 +26,15 @@ import org.sonar.api.web.WidgetPropertyType; @WidgetCategory("History") @WidgetProperties({ - @WidgetProperty(key = "chartTitle", type = WidgetPropertyType.STRING), - @WidgetProperty(key = "metric1", type = WidgetPropertyType.METRIC, defaultValue = "ncloc", options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), - @WidgetProperty(key = "metric2", type = WidgetPropertyType.METRIC, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), - @WidgetProperty(key = "metric3", type = WidgetPropertyType.METRIC, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), - @WidgetProperty(key = "hideEvents", type = WidgetPropertyType.BOOLEAN), - @WidgetProperty(key = "chartHeight", type = WidgetPropertyType.INTEGER, defaultValue = "180") + @WidgetProperty(key = "chartTitle", type = WidgetPropertyType.STRING), + @WidgetProperty(key = "metric1", type = WidgetPropertyType.METRIC, defaultValue = "ncloc", options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), + @WidgetProperty(key = "metric2", type = WidgetPropertyType.METRIC, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), + @WidgetProperty(key = "metric3", type = WidgetPropertyType.METRIC, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), + @WidgetProperty(key = "hideEvents", type = WidgetPropertyType.BOOLEAN), + @WidgetProperty(key = "chartHeight", type = WidgetPropertyType.INTEGER, defaultValue = "180") }) public class TimelineWidget extends CoreWidget { public TimelineWidget() { - super("timeline", "Timeline", "/org/sonar/plugins/core/widgets/timeline.html.erb"); + super("timeline", "Timeline", "/org/sonar/server/dashboard/widget/timeline.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TreemapWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TreemapWidget.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TreemapWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TreemapWidget.java index e0787c4c5a8..e70a341b431 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/TreemapWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/TreemapWidget.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.WidgetProperties; @@ -35,6 +35,6 @@ import org.sonar.api.web.WidgetPropertyType; }) public class TreemapWidget extends CoreWidget { public TreemapWidget() { - super("treemap-widget", "Treemap of Components", "/org/sonar/plugins/core/widgets/treemap.html.erb"); + super("treemap-widget", "Treemap of Components", "/org/sonar/server/dashboard/widget/treemap.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WelcomeWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WelcomeWidget.java similarity index 90% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WelcomeWidget.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WelcomeWidget.java index 936e8cdcc07..743f44fbf0b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WelcomeWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WelcomeWidget.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import org.sonar.api.web.WidgetScope; @@ -29,6 +29,6 @@ public class WelcomeWidget extends CoreWidget { public static final String ID = "welcome"; public WelcomeWidget() { - super(ID, "Welcome", "/org/sonar/plugins/core/widgets/welcome.html.erb"); + super(ID, "Welcome", "/org/sonar/server/dashboard/widget/welcome.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WidgetConstants.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WidgetConstants.java similarity index 96% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WidgetConstants.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WidgetConstants.java index 0a74fa3d754..55f6efe36ac 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/WidgetConstants.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/WidgetConstants.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; /** * Constants shared accross multiple widgets diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/package-info.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/package-info.java index 6d9fc80d519..2e21d54b045 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/charts/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/package-info.java @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.plugins.core.charts; +package org.sonar.server.dashboard.widget; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java index 354239cf756..49ed5a37786 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java @@ -20,6 +20,7 @@ package org.sonar.server.dashboard.ws; import com.google.common.collect.ListMultimap; +import java.util.Collection; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -33,8 +34,6 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; -import java.util.Collection; - public class ShowAction implements DashboardsWsAction { private static final String PARAM_KEY = "key"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/package-info.java index d7b36f91de1..df3059cd05f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/package-info.java @@ -21,3 +21,4 @@ package org.sonar.server.dashboard.ws; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/template/MyFavouritesFilter.java similarity index 97% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/template/MyFavouritesFilter.java index f5fb03feb20..96e0e7eca13 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/template/MyFavouritesFilter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.measurefilters; +package org.sonar.server.measure.template; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.Filter; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java similarity index 97% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java index 19e33ac10dd..a82ae695a82 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.measurefilters; +package org.sonar.server.measure.template; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Qualifiers; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/template/package-info.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/template/package-info.java index 4700c0a28ef..4a9c1cded91 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/template/package-info.java @@ -18,4 +18,4 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @javax.annotation.ParametersAreNonnullByDefault -package org.sonar.plugins.core.measurefilters; +package org.sonar.server.measure.template; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 2bf4c9ca845..59f0cc900fc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -58,6 +58,8 @@ import org.sonar.server.activity.ws.ActivityMapping; import org.sonar.server.authentication.ws.AuthenticationWs; import org.sonar.server.batch.BatchWsModule; import org.sonar.server.charts.ChartFactory; +import org.sonar.server.charts.DistributionAreaChart; +import org.sonar.server.charts.DistributionBarChart; import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentService; import org.sonar.server.component.DefaultComponentFinder; @@ -72,6 +74,40 @@ import org.sonar.server.computation.ws.HistoryAction; import org.sonar.server.computation.ws.IsQueueEmptyWs; import org.sonar.server.computation.ws.QueueAction; import org.sonar.server.config.ws.PropertiesWs; +import org.sonar.server.dashboard.template.GlobalDefaultDashboard; +import org.sonar.server.dashboard.template.ProjectDefaultDashboard; +import org.sonar.server.dashboard.template.ProjectIssuesDashboard; +import org.sonar.server.dashboard.template.ProjectTimeMachineDashboard; +import org.sonar.server.dashboard.widget.ActionPlansWidget; +import org.sonar.server.dashboard.widget.AlertsWidget; +import org.sonar.server.dashboard.widget.BubbleChartWidget; +import org.sonar.server.dashboard.widget.ComplexityWidget; +import org.sonar.server.dashboard.widget.CoverageWidget; +import org.sonar.server.dashboard.widget.CustomMeasuresWidget; +import org.sonar.server.dashboard.widget.DebtOverviewWidget; +import org.sonar.server.dashboard.widget.DescriptionWidget; +import org.sonar.server.dashboard.widget.DocumentationCommentsWidget; +import org.sonar.server.dashboard.widget.DuplicationsWidget; +import org.sonar.server.dashboard.widget.EventsWidget; +import org.sonar.server.dashboard.widget.HotspotMetricWidget; +import org.sonar.server.dashboard.widget.IssueFilterWidget; +import org.sonar.server.dashboard.widget.IssueTagCloudWidget; +import org.sonar.server.dashboard.widget.IssuesWidget; +import org.sonar.server.dashboard.widget.ItCoverageWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsBubbleChartWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsCloudWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsHistogramWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsPieChartWidget; +import org.sonar.server.dashboard.widget.MeasureFilterAsTreemapWidget; +import org.sonar.server.dashboard.widget.MeasureFilterListWidget; +import org.sonar.server.dashboard.widget.ProjectFileCloudWidget; +import org.sonar.server.dashboard.widget.ProjectIssueFilterWidget; +import org.sonar.server.dashboard.widget.SizeWidget; +import org.sonar.server.dashboard.widget.TechnicalDebtPyramidWidget; +import org.sonar.server.dashboard.widget.TimeMachineWidget; +import org.sonar.server.dashboard.widget.TimelineWidget; +import org.sonar.server.dashboard.widget.TreemapWidget; +import org.sonar.server.dashboard.widget.WelcomeWidget; import org.sonar.server.dashboard.ws.DashboardsWs; import org.sonar.server.debt.DebtCharacteristicsXMLImporter; import org.sonar.server.debt.DebtModelBackup; @@ -126,6 +162,8 @@ import org.sonar.server.language.ws.LanguageWs; import org.sonar.server.measure.MeasureFilterEngine; import org.sonar.server.measure.MeasureFilterExecutor; import org.sonar.server.measure.MeasureFilterFactory; +import org.sonar.server.measure.template.MyFavouritesFilter; +import org.sonar.server.measure.template.ProjectFilter; import org.sonar.server.measure.ws.ManualMeasuresWs; import org.sonar.server.measure.ws.TimeMachineWs; import org.sonar.server.metric.ws.MetricsWs; @@ -298,6 +336,8 @@ public class PlatformLevel4 extends PlatformLevel { add( PluginDownloader.class, ChartFactory.class, + DistributionBarChart.class, + DistributionAreaChart.class, Views.class, ResourceTypes.class, SettingsChangeNotifier.class, @@ -321,6 +361,40 @@ public class PlatformLevel4 extends PlatformLevel { // Dashboard DashboardsWs.class, org.sonar.server.dashboard.ws.ShowAction.class, + ProjectDefaultDashboard.class, + ProjectIssuesDashboard.class, + ProjectTimeMachineDashboard.class, + GlobalDefaultDashboard.class, + AlertsWidget.class, + CoverageWidget.class, + ItCoverageWidget.class, + DescriptionWidget.class, + ComplexityWidget.class, + IssuesWidget.class, + SizeWidget.class, + EventsWidget.class, + CustomMeasuresWidget.class, + TimelineWidget.class, + BubbleChartWidget.class, + TimeMachineWidget.class, + HotspotMetricWidget.class, + TreemapWidget.class, + MeasureFilterListWidget.class, + MeasureFilterAsTreemapWidget.class, + WelcomeWidget.class, + DocumentationCommentsWidget.class, + DuplicationsWidget.class, + TechnicalDebtPyramidWidget.class, + MeasureFilterAsPieChartWidget.class, + MeasureFilterAsCloudWidget.class, + MeasureFilterAsHistogramWidget.class, + MeasureFilterAsBubbleChartWidget.class, + ProjectFileCloudWidget.class, + DebtOverviewWidget.class, + ActionPlansWidget.class, + IssueFilterWidget.class, + ProjectIssueFilterWidget.class, + IssueTagCloudWidget.class, // update center UpdateCenterClient.class, @@ -412,6 +486,8 @@ public class PlatformLevel4 extends PlatformLevel { MeasureFilterFactory.class, MeasureFilterExecutor.class, MeasureFilterEngine.class, + ProjectFilter.class, + MyFavouritesFilter.class, DefaultMetricFinder.class, ServerLifecycleNotifier.class, TimeMachineWs.class, diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/_complexity_chart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/_complexity_chart.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/_complexity_chart.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/_complexity_chart.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/action_plans.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/action_plans.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/alerts.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/alerts.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/alerts.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/alerts.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/bubbleChart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/bubbleChart.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/bubbleChart.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/bubbleChart.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/complexity.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/complexity.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/coverage.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/coverage.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/custom_measures.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/custom_measures.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/custom_measures.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/custom_measures.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/debt_overview.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/debt_overview.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/debt_overview.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/debt_overview.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/documentation_comments_widget.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/documentation_comments_widget.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/duplications_widget.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/duplications_widget.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/events.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/events.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/hotspot_metric.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/hotspot_metric.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_tag_cloud.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_tag_cloud.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_tag_cloud.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_tag_cloud.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issues.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issues.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/it_coverage.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/it_coverage.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_bubble_chart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_bubble_chart.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_histogram.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_histogram.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_histogram.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_histogram.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_list.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_list.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_pie_chart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_pie_chart.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_treemap.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_treemap.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_file_cloud.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_file_cloud.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/project_issue_filter.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/project_issue_filter.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/size.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/size.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/technical_debt_pyramid.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/technical_debt_pyramid.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/technical_debt_pyramid.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/technical_debt_pyramid.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/time_machine.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/time_machine.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/time_machine.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/time_machine.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/timeline.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/timeline.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/treemap.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/treemap.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/treemap.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/treemap.html.erb diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/welcome.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/welcome.html.erb similarity index 100% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/welcome.html.erb rename to server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/welcome.html.erb diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/AbstractChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/AbstractChartTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/AbstractChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/AbstractChartTest.java index 31223db492f..e1110fa24e8 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/AbstractChartTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/charts/AbstractChartTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.charts; +package org.sonar.server.charts; import org.apache.commons.io.FileUtils; import org.jfree.chart.ChartUtilities; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionAreaChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/DistributionAreaChartTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionAreaChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/DistributionAreaChartTest.java index 6a535abad16..0d40c7031a5 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionAreaChartTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/charts/DistributionAreaChartTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.charts; +package org.sonar.server.charts; import org.junit.Test; import org.sonar.api.charts.ChartParameters; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionBarChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/DistributionBarChartTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionBarChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/DistributionBarChartTest.java index 8e50f49ab24..55dd0f4a100 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/charts/DistributionBarChartTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/charts/DistributionBarChartTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.charts; +package org.sonar.server.charts; import org.junit.Test; import org.sonar.api.charts.ChartParameters; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java similarity index 85% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java rename to server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java index a89ebdbfa59..f9f784bd830 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java @@ -17,22 +17,20 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.sonar.api.web.Dashboard; import org.sonar.api.web.Dashboard.Widget; import org.sonar.core.measure.db.MeasureFilterDao; import org.sonar.core.measure.db.MeasureFilterDto; -import org.sonar.plugins.core.CorePlugin; -import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; -import org.sonar.plugins.core.measurefilters.ProjectFilter; -import org.sonar.plugins.core.widgets.WelcomeWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsTreemapWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterListWidget; - -import java.util.List; +import org.sonar.server.dashboard.widget.MeasureFilterAsTreemapWidget; +import org.sonar.server.dashboard.widget.MeasureFilterListWidget; +import org.sonar.server.dashboard.widget.WelcomeWidget; +import org.sonar.server.measure.template.MyFavouritesFilter; +import org.sonar.server.measure.template.ProjectFilter; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -53,19 +51,14 @@ public class GlobalDefaultDashboardTest { assertThat(template.getName()).isEqualTo("Home"); } - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(template.getClass()); - } - @Test public void should_create_global_dashboard_with_four_widgets() { when(dao.findSystemFilterByName(MyFavouritesFilter.NAME)).thenReturn( new MeasureFilterDto().setId(100L) - ); + ); when(dao.findSystemFilterByName(ProjectFilter.NAME)).thenReturn( new MeasureFilterDto().setId(101L) - ); + ); Dashboard dashboard = template.createDashboard(); List firstColumn = dashboard.getWidgetsOfColumn(1); assertThat(firstColumn).hasSize(2); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectDefaultDashboardTest.java similarity index 86% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java rename to server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectDefaultDashboardTest.java index a5168888bed..2050d5c78c5 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectDefaultDashboardTest.java @@ -17,12 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.junit.Test; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; -import org.sonar.plugins.core.CorePlugin; import static org.assertj.core.api.Assertions.assertThat; @@ -34,11 +33,6 @@ public class ProjectDefaultDashboardTest { assertThat(template.getName()).isEqualTo("Dashboard"); } - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(template.getClass()); - } - @Test public void should_create_dashboard() { Dashboard dashboard = template.createDashboard(); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java similarity index 90% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboardTest.java rename to server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java index 716a43843b6..b84c0a00ae1 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.junit.Before; import org.junit.ClassRule; @@ -28,7 +28,6 @@ import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; import org.sonar.core.issue.db.IssueFilterDao; import org.sonar.core.persistence.DbTester; -import org.sonar.plugins.core.CorePlugin; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -52,11 +51,6 @@ public class ProjectIssuesDashboardTest { assertThat(template.getName()).isEqualTo("Issues"); } - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(template.getClass()); - } - @Test public void should_create_dashboard() { dbTester.prepareDbUnit(getClass(), "filters.xml"); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboardTest.java similarity index 88% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboardTest.java rename to server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboardTest.java index e207bfe2be8..84f96ed662d 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectTimeMachineDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectTimeMachineDashboardTest.java @@ -17,13 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.dashboards; +package org.sonar.server.dashboard.template; import org.junit.Test; import org.sonar.api.web.Dashboard; import org.sonar.api.web.Dashboard.Widget; import org.sonar.api.web.DashboardLayout; -import org.sonar.plugins.core.CorePlugin; import static org.assertj.core.api.Assertions.assertThat; @@ -35,11 +34,6 @@ public class ProjectTimeMachineDashboardTest { assertThat(template.getName()).isEqualTo("TimeMachine"); } - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(template.getClass()); - } - @Test public void should_create_dashboard() { Dashboard dashboard = template.createDashboard(); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/widget/CoreWidgetsTest.java similarity index 85% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/dashboard/widget/CoreWidgetsTest.java index 0cf8aeb9eb0..bc15edfa8c9 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/CoreWidgetsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/widget/CoreWidgetsTest.java @@ -17,21 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.widgets; +package org.sonar.server.dashboard.widget; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import org.junit.Test; -import org.reflections.Reflections; -import org.sonar.plugins.core.CorePlugin; - -import javax.annotation.Nullable; - import java.util.Collection; import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.junit.Test; +import org.reflections.Reflections; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -42,7 +40,7 @@ public class CoreWidgetsTest { public void widget_ids_should_be_unique() { Collection widgets = widgets(); Collection widgetIds = Collections2.transform(widgets, new Function() { - public String apply(@Nullable CoreWidget widget) { + public String apply(@Nonnull CoreWidget widget) { return widget.getId(); } }); @@ -53,7 +51,7 @@ public class CoreWidgetsTest { public void widget_templates_should_be_unique() { Collection widgets = widgets(); Collection templates = Collections2.transform(widgets, new Function() { - public String apply(@Nullable CoreWidget widget) { + public String apply(@Nonnull CoreWidget widget) { return widget.getTemplatePath(); } }); @@ -64,7 +62,7 @@ public class CoreWidgetsTest { public void widget_titles_should_be_unique() { Collection widgets = widgets(); Collection templates = Collections2.transform(widgets, new Function() { - public String apply(@Nullable CoreWidget widget) { + public String apply(@Nonnull CoreWidget widget) { return widget.getTitle(); } }); @@ -80,20 +78,13 @@ public class CoreWidgetsTest { } } - @Test - public void should_be_registered_as_an_extension() { - for (CoreWidget widget : widgets()) { - assertThat(new CorePlugin().getExtensions()).contains(widget.getClass()); - } - } - @Test public void should_find_core_widgets() { assertThat(widgets().size()).isGreaterThan(23); } private Set> widgetClasses() { - String[] packages = {"org.sonar.plugins.core.widgets", "org.sonar.plugins.core.widgets.issues"}; + String[] packages = {"org.sonar.server.dashboard.widget"}; return new Reflections(packages).getSubTypesOf(CoreWidget.class); } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/template/MyFavouritesFilterTest.java similarity index 85% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/template/MyFavouritesFilterTest.java index 3c894cdb439..1aa6b5803b5 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/template/MyFavouritesFilterTest.java @@ -17,11 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.measurefilters; +package org.sonar.server.measure.template; import org.junit.Test; import org.sonar.api.web.Filter; -import org.sonar.plugins.core.CorePlugin; import static org.assertj.core.api.Assertions.assertThat; @@ -38,9 +37,4 @@ public class MyFavouritesFilterTest { assertThat(filter.getCriteria()).isEmpty(); assertThat(filter.getColumns()).hasSize(3); } - - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(MyFavouritesFilter.class); - } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/template/ProjectFilterTest.java similarity index 85% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/template/ProjectFilterTest.java index 9e7a96a5781..783b3f37a06 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/template/ProjectFilterTest.java @@ -17,11 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.measurefilters; +package org.sonar.server.measure.template; import org.junit.Test; import org.sonar.api.web.Filter; -import org.sonar.plugins.core.CorePlugin; import static org.assertj.core.api.Assertions.assertThat; @@ -37,9 +36,4 @@ public class ProjectFilterTest { assertThat(filter.getCriteria()).hasSize(1); assertThat(filter.getColumns()).hasSize(6); } - - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(ProjectFilter.class); - } } diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/dashboards/ProjectIssuesDashboardTest/filters.xml b/server/sonar-server/src/test/resources/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest/filters.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/dashboards/ProjectIssuesDashboardTest/filters.xml rename to server/sonar-server/src/test/resources/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest/filters.xml -- 2.39.5