remove dependency from sonar-webserver-webapi to sonar-server

388 files changed, 323 insertions, 395 deletions

diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java
index 8ce64c942dd..69edab2e6c6 100644
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java
@@ -46,9 +46,7 @@ import static org.mockito.Mockito.when;
 import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
 import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto;
 import static org.sonar.db.organization.OrganizationTesting.newOrganizationDto;
-import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.DIRECTORY;
 import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.FILE;
-import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.MODULE;
 import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.PROJECT;
 import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.UNRECOGNIZED;
 import static org.sonar.scanner.protocol.output.ScannerReport.Component.newBuilder;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/MetricToDto.java b/server/sonar-server-common/src/main/java/org/sonar/server/metric/MetricToDto.java
index 73b4a2599b1..73b4a2599b1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/MetricToDto.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/metric/MetricToDto.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryData.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryData.java
index 89f3df4b38f..89f3df4b38f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryData.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java
index 8f4d17696d5..8f4d17696d5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java
index 25762f5b25c..25762f5b25c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 4084fea8809..13ff9a20c67 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -4,15 +4,6 @@ sonarqube {
   }
 }
 
-sourceSets {
-  test {
-    resources {
-      srcDirs += ['src/test/projects']
-    }
-  }
-}
-
-
 import org.apache.tools.ant.filters.ReplaceTokens
 processResources {
   filesMatching('build.properties') {
@@ -53,7 +44,6 @@ dependencies {
   compile project(':server:sonar-webserver-auth')
   compile project(':server:sonar-webserver-common')
   compile project(':server:sonar-webserver-es')
-  compile project(':server:sonar-webserver-ws')
   compile project(':sonar-core')
   compile project(':sonar-duplications')
   compile project(':sonar-scanner-protocol')
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/AbstractSystemInfoWriter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java
index c6d2b88de20..fad900559ed 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/AbstractSystemInfoWriter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.util.Collection;
 import org.sonar.api.utils.text.JsonWriter;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java
index 74d7aef1e0f..818e13930c3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java
@@ -25,6 +25,7 @@ import org.sonar.api.config.Settings;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.property.PropertyDto;
+import org.sonar.server.setting.SettingsChangeNotifier;
 
 public class PersistentSettings {
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
index 812b3d9254b..884c7d343de 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
@@ -25,6 +25,7 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
+import org.sonar.server.setting.SettingsChangeNotifier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml
deleted file mode 100644
index d3e86d6cf95..00000000000
--- a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonarsource.sonarqube.tests</groupId>
-  <artifactId>test-core-plugin</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>sonar-plugin</packaging>
-  <name>Test Core Plugin</name>
-  <description>Fake core plugin used by tests</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-plugin-api</artifactId>
-      <version>4.5.4</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
-        <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>1.15</version>
-        <extensions>true</extensions>
-        <configuration>
-          <pluginKey>core</pluginKey>
-          <pluginClass>CorePlugin</pluginClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar
deleted file mode 100644
index 831cc364b5c..00000000000
--- a/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar
+++ /dev/null
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json
deleted file mode 100644
index c38e4a347f9..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": 25,
-  "severity": "MINOR",
-  "profileId": 1,
-  "inheritance": null
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json
deleted file mode 100644
index fb70c854fde..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": 391,
-  "severity": "MINOR",
-  "profileId": 2,
-  "inheritance": "INHERITED",
-  "activeRuleParentId": 25
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json
deleted file mode 100644
index bcd7657a309..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 2303,
-  "key": "RuleA",
-  "language": "xoo",
-  "name": "A first rule",
-  "description": "First rule of Fight Club is: you do not talk about Fight Club.",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json
deleted file mode 100644
index edd28e543ca..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 2305,
-  "key": "RuleC",
-  "language": "xoo",
-  "name": "C third rule",
-  "description": "Third rule of Fight Club: someone yells stop, goes limp, taps out, the fight is over.",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "BLOCKER",
-  "status": "READY",
-  "createdAt": "2013-07-04T07:38:05.543Z",
-  "updatedAt": "2013-03-27T08:52:40.370Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json
deleted file mode 100644
index 89ce23ad769..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 2304,
-  "key": "Ruleb",
-  "language": "xoo",
-  "name": "b second rule",
-  "description": "Second rule of Fight Club is: you do NOT talk about Fight Club.",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "MAJOR",
-  "status": "READY",
-  "createdAt": "2013-12-04T10:24:11.000Z",
-  "updatedAt": "2013-12-12T15:20:01.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json
deleted file mode 100644
index 50548b21f07..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": 2307,
-  "severity": "CRITICAL",
-  "profileId": 2,
-  "inheritance": null
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json
deleted file mode 100644
index ed94424e6ac..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": 2303,
-  "severity": "INFO",
-  "profileId": 2,
-  "inheritance": null
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json
deleted file mode 100644
index 948107d967b..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": 2304,
-  "key": "RuleWithTagA",
-  "language": "xoo",
-  "name": "Rule with tag taga",
-  "description": "This rule has tag 'taga'",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "systemTags": ["taga"],
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json
deleted file mode 100644
index 3ca733480ae..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": 2305,
-  "key": "RuleWithTagsAB",
-  "language": "xoo",
-  "name": "Rule with tags taga and tagb",
-  "description": "This rule has tags 'taga' and 'tagb'",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "systemTags": ["tagb"],
-  "adminTags": ["taga"],
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json
deleted file mode 100644
index 44243bb1fdb..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": 2307,
-  "key": "RuleWithTagsACE",
-  "language": "xoo",
-  "name": "Rule with tags taga, tagc and tage",
-  "description": "This rule has tags 'taga', 'tagc' and 'tage'",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "systemTags": ["taga", "tagc"],
-  "adminTags": ["tage"],
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json
deleted file mode 100644
index 59ca77178d4..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": 2306,
-  "key": "RuleWithTagsBC",
-  "language": "xoo",
-  "name": "Rule with tags tagb and tagc",
-  "description": "This rule has tags 'tagb' and 'tagc'",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "systemTags": ["tagb", "tagc"],
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json
deleted file mode 100644
index 43ca4f94522..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 2303,
-  "key": "RuleWithoutTags",
-  "language": "xoo",
-  "name": "Rule without tags",
-  "description": "This rule has no tag",
-  "parentKey": null,
-  "repositoryKey": "xoo",
-  "severity": "INFO",
-  "status": "READY",
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json
deleted file mode 100644
index 38c9040b3b5..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": 25,
-  "severity": "MINOR",
-  "profileId": 1,
-  "inheritance": "OVERRIDES"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json
deleted file mode 100644
index 2025fbe362c..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": 2702,
-  "severity": "CRITICAL",
-  "profileId": 1,
-  "inheritance": null,
-  "params": [
-    {
-      "key": "fromClasses",
-      "value": "**.core.**"
-    },
-    {
-      "key": "toClasses",
-      "value": "**.server.**"
-    }
-  ]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json
deleted file mode 100644
index 2bb34dc2042..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": 391,
-  "severity": "MAJOR",
-  "profileId": 1,
-  "inheritance": "INHERITED",
-  "activeRuleParentId": 25
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json
deleted file mode 100644
index 96af0f464a5..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": 523,
-  "severity": "MAJOR",
-  "profileId": 2,
-  "inheritance": null
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json
deleted file mode 100644
index 3f2ca70c432..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "id": 1482,
-  "key": "ArchitecturalConstraint",
-  "language": "java",
-  "name": "Architectural constraint",
-  "description": "<p>A source code comply to an architectural model when it fully\n\tadheres to a set of architectural constraints. A constraint allows to\n\tdeny references between classes by pattern.</p>\n<p>You can for instance use this rule to :</p>\n<ul>\n\t<li>forbid access to **.web.** from **.dao.** classes</li>\n\t<li>forbid access to java.util.Vector, java.util.Hashtable and\n\t\tjava.util.Enumeration from any classes</li>\n\t<li>forbid access to java.sql.** from **.ui.** and **.web.**\n\t\tclasses</li>\n</ul>",
-  "parentKey": null,
-  "repositoryKey": "squid",
-  "severity": "MAJOR",
-  "status": "READY",
-  "createdAt": "2013-12-11T13:48:00.799Z",
-  "updatedAt": "2013-12-13T17:26:35.767Z",
-  "params": [
-    {
-      "key": "toClasses",
-      "type": "STRING",
-      "defaultValue": "",
-      "description": "Mandatory. Ex : java.util.Vector, java.util.Hashtable, java.util.Enumeration"
-    },
-    {
-      "key": "fromClasses",
-      "type": "STRING",
-      "defaultValue": "",
-      "description": "Optional. If this property is not defined, all classes should adhere to this constraint. Ex : **.web.**"
-    }
-  ]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json
deleted file mode 100644
index 6fff4e43a57..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 25,
-  "key": "DM_CONVERT_CASE",
-  "language": "java",
-  "name": "Internationalization - Consider using Locale parameterized version of invoked method",
-  "description": "<p> A String is being converted to upper or lowercase, using the platform's default encoding. This may\n      result in improper conversions when used with international characters. Use the </p>\n      <table><tr><td>String.toUpperCase( Locale l )</td></tr><tr><td>String.toLowerCase( Locale l )</td></tr></table>\n      <p>versions instead.</p>",
-  "parentKey": null,
-  "repositoryKey": "findbugs",
-  "severity": "INFO",
-  "status": "READY",
-  "createdAt": "2013-12-04T10:24:09.000Z",
-  "updatedAt": "2013-12-12T15:19:59.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json
deleted file mode 100644
index 7dc6d03b585..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": 719,
-  "key": "com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck",
-  "language": "java",
-  "name": "Double Checked Locking",
-  "description": null,
-  "parentKey": null,
-  "repositoryKey": "checkstyle",
-  "severity": "MAJOR",
-  "status": "READY",
-  "cardinality": "SINGLE",
-  "createdAt": "2013-07-04T07:38:05.543Z",
-  "updatedAt": "2013-03-27T08:52:40.370Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json
deleted file mode 100644
index ceecbbff6de..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": 759,
-  "key": "UnusedNullCheckInEquals",
-  "language": "java",
-  "name": "Unused Null Check In Equals",
-  "description": "After checking an object reference for null, you should invoke equals() on that object rather than passing it to another object's equals() method.",
-  "parentKey": null,
-  "repositoryKey": "pmd",
-  "severity": "MAJOR",
-  "status": "READY",
-  "createdAt": "2013-12-04T10:24:11.000Z",
-  "updatedAt": "2013-12-12T15:20:01.000Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json
deleted file mode 100644
index dc42767a299..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": 860,
-  "key": "Snippet",
-  "language": null,
-  "name": null,
-  "description": null,
-  "parentKey": null,
-  "repositoryKey": "squid",
-  "severity": "MAJOR",
-  "status": "REMOVED",
-  "cardinality": "MULTIPLE",
-  "createdAt": "2013-07-04T07:38:05.543Z",
-  "updatedAt": "2013-03-27T08:52:40.370Z"
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json
deleted file mode 100644
index a8a2d311d71..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": 944,
-  "key": "S1125",
-  "language": "java",
-  "name": "Boolean expressions should not be compared to true or false",
-  "description": "<p> Boolean expressions should not be compared against boolean literals, as their value can be directly used. </p> <p>The following code:</p> <pre> if (booleanVariable == true) { /* ... */ } // Non-Compliant if (booleanVariable != true) { /* ... */ } // Non-Compliant </pre> <p>should be refactored into:</p> <pre> if (booleanVariable) { /* ... */ } // Compliant if (!booleanVariable) { /* ... */ } // Compliant </pre>",
-  "parentKey": null,
-  "repositoryKey": "squid",
-  "severity": "MAJOR",
-  "status": "READY",
-  "cardinality": "SINGLE",
-  "createdAt": "2013-07-26T07:40:51.977Z",
-  "updatedAt": "2014-01-10T15:38:27.386Z"
-}
diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-common/build.gradle
index 56cf937d9e2..17637fc201a 100644
--- a/server/sonar-webserver-common/build.gradle
+++ b/server/sonar-webserver-common/build.gradle
@@ -4,6 +4,14 @@ sonarqube {
   }
 }
 
+sourceSets {
+  test {
+    resources {
+      srcDirs += ['src/test/projects']
+    }
+  }
+}
+
 configurations {
   tests
 
@@ -19,6 +27,7 @@ dependencies {
   compile project(':sonar-core')
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
+  compile project(':server:sonar-server-common')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile 'org.mindrot:jbcrypt'
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
index 44bdc4377e3..44bdc4377e3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
index 12b3f68543c..12b3f68543c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java
index dfc6c8c8414..dfc6c8c8414 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
index 98354a8e77b..98354a8e77b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java
index 323232ae563..7170de2498d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.favorite;
+package org.sonar.server.app;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeature.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java
index 7d60949c954..7d60949c954 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeature.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
index 20fc40ff324..20fc40ff324 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
index 8647d7c421f..8647d7c421f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
index 634e59721a7..634e59721a7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java
index cb79dbcf31d..cb79dbcf31d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealth.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java
index 23fcfca9f7a..23fcfca9f7a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealth.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/Health.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java
index d5b49449bbe..d5b49449bbe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/Health.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthChecker.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java
index 80fb8aed1bf..80fb8aed1bf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/HealthChecker.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java
index 18ea762c56b..18ea762c56b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java
index fd6726573b8..3a82f471f6a 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import org.sonar.api.utils.text.JsonWriter;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java
index 09bb2e5b403..71d187381a7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.settings;
+package org.sonar.server.platform;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPlugin.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
index 0fffb7b7d78..0fffb7b7d78 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java
index d61efac304c..d61efac304c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginFileSystem.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
index e65336a7586..e65336a7586 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginUninstaller.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
index 8253dbaf8c1..8253dbaf8c1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
index 1970d4475a5..1970d4475a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
index ecc3abc2d76..ecc3abc2d76 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
index 2f5d0b2d357..2f5d0b2d357 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
index 0c0a6730987..0c0a6730987 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
index 9fa956d2a15..9fa956d2a15 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
index f6c1db3b035..f6c1db3b035 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java
index e0a7b00bbf9..e0a7b00bbf9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java
index 2ef44accfd2..cc398bb88c6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java
@@ -21,4 +21,3 @@
 package org.sonar.server.plugins;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
index 6afdea527e9..6afdea527e9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
index 7f3d3f1867d..7f3d3f1867d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
index af440d60adb..af440d60adb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/RekeyedProject.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java
index ecab0b148f8..ecab0b148f8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/RekeyedProject.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java
index edf05180276..edf05180276 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java
index 205d7058e06..205d7058e06 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
index 7591c138d28..7591c138d28 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
index 6953a77575e..6953a77575e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
index c3baf201471..c3baf201471 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
index e2e66b555de..e2e66b555de 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
index 76a4c2bebf1..76a4c2bebf1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
index 6ef8397046a..6ef8397046a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
index ed52cd87a47..ed52cd87a47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java
index eaada4f4db1..e261763e6f5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoader.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.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.server.settings;
+package org.sonar.server.setting;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoaderImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java
index b487038ab68..95e11242587 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoaderImpl.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.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.server.settings;
+package org.sonar.server.setting;
 
 import java.util.List;
 import java.util.Map;
@@ -30,7 +30,6 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.property.PropertyDto;
-import org.sonar.server.setting.ChildSettings;
 
 import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java
index 1ea0a48ec2d..de074ef5232 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.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.server.platform;
+package org.sonar.server.setting;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.config.GlobalPropertyChangeHandler;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java
index a66df8906dd..e816bf4051c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.permission;
+package org.sonar.server.setting;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
index de5f24347fc..de5f24347fc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
index 6fb3d9a6449..6fb3d9a6449 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureRule.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
index 2bf56463474..2bf56463474 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
index 27c2e469dde..27c2e469dde 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
index f984cd9bd1e..f984cd9bd1e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
index bc353f99778..bc353f99778 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
index 20eae5f2781..20eae5f2781 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
index 8f4d928cd4c..8f4d928cd4c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
index e426c9ebfea..e426c9ebfea 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java
index 7952eb5799c..7952eb5799c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
index 9710a8689e4..9710a8689e4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
index b1e50cba77c..b1e50cba77c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
index a71522a77d5..a71522a77d5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
index d6d9904452d..d6d9904452d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
index 907768f56fa..907768f56fa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
index 8085b643ede..8085b643ede 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/RekeyedProjectTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
index a847d91d0d8..a847d91d0d8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
index 964637487fb..964637487fb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
index eb4ce5d6c60..eb4ce5d6c60 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectConfigurationLoaderImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java
index 60944a2a608..0fb88ee9b05 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectConfigurationLoaderImplTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.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.server.settings;
+package org.sonar.server.setting;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java
index 973f8e73d64..577eda83519 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.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.server.platform;
+package org.sonar.server.setting;
 
 import org.junit.Test;
 import org.sonar.api.config.GlobalPropertyChangeHandler;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/TestProjectConfigurationLoader.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java
index 36820604f60..e0c0b6d2854 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/settings/TestProjectConfigurationLoader.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.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.server.settings;
+package org.sonar.server.setting;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/sonar-server/src/test/projects/.gitignore b/server/sonar-webserver-common/src/test/projects/.gitignore
index a945b8525e6..a945b8525e6 100644
--- a/server/sonar-server/src/test/projects/.gitignore
+++ b/server/sonar-webserver-common/src/test/projects/.gitignore
diff --git a/server/sonar-server/src/test/projects/README.txt b/server/sonar-webserver-common/src/test/projects/README.txt
index c53a66d52f2..c53a66d52f2 100644
--- a/server/sonar-server/src/test/projects/README.txt
+++ b/server/sonar-webserver-common/src/test/projects/README.txt
diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml
index 72a04dbe04f..72a04dbe04f 100644
--- a/server/sonar-server/src/test/projects/fake-report-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java
diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
index 6085e44fdca..6085e44fdca 100644
--- a/server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml
index e417dd96fba..e417dd96fba 100644
--- a/server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
index b5c99f721b3..b5c99f721b3 100644
--- a/server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml
index 1ef73d2ffda..1ef73d2ffda 100644
--- a/server/sonar-server/src/test/projects/fake-views-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java
diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
index a47d93d94a8..a47d93d94a8 100644
--- a/server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/pom.xml b/server/sonar-webserver-common/src/test/projects/pom.xml
index 37338313ac0..37338313ac0 100644
--- a/server/sonar-server/src/test/projects/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml
index 982be1c0170..982be1c0170 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
index 1d4ef5430c7..1d4ef5430c7 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml
index c4e95936e74..c4e95936e74 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java
diff --git a/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
index 739a22fcdae..739a22fcdae 100644
--- a/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml
index e23667e6318..e23667e6318 100644
--- a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
index d364a2f9dd4..d364a2f9dd4 100644
--- a/server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
index 2f63c2e652c..2f63c2e652c 100644
--- a/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml
index 2d49cca2cf2..2d49cca2cf2 100644
--- a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java
index 7e3ebe0909c..7e3ebe0909c 100644
--- a/server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java
diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
index 6ebe8652d8b..6ebe8652d8b 100644
--- a/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml
index 62462ffbf34..62462ffbf34 100644
--- a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java b/server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java
index 847ae2d994e..847ae2d994e 100644
--- a/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java
diff --git a/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
index f5fc95f9d0d..f5fc95f9d0d 100644
--- a/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml
index 044cd94e8f0..044cd94e8f0 100644
--- a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml
+++ b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml
diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
index 0d14cde33c1..0d14cde33c1 100644
--- a/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
+++ b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
index 0dd577fc360..0dd577fc360 100644
--- a/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/resources/logback-test.xml b/server/sonar-webserver-common/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..3e34b0f9fc8
--- /dev/null
+++ b/server/sonar-webserver-common/src/test/resources/logback-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index f99c8246c6a..b5d66accd1c 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -14,12 +14,15 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'com.google.guava:guava'
+  compile project(':server:sonar-ce-common')
+  compile project(':server:sonar-ce-task')
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server')
   compile project(':server:sonar-webserver-auth')
   compile project(':server:sonar-webserver-es')
   compile project(':server:sonar-webserver-ws')
+  compile project(':sonar-scanner-protocol')
 
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly 'javax.servlet:javax.servlet-api'
@@ -30,11 +33,14 @@ dependencies {
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.h2database:h2'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'com.squareup.okhttp3:mockwebserver'
+  testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server", configuration: "tests")
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/CeModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java
index c228b87ebd0..033bc5a9253 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/CeModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java
@@ -21,7 +21,6 @@ package org.sonar.server.ce;
 
 import org.sonar.ce.queue.CeQueueImpl;
 import org.sonar.ce.task.log.CeTaskLogging;
-import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor;
 import org.sonar.core.platform.Module;
 import org.sonar.server.ce.http.CeHttpClientImpl;
 import org.sonar.server.ce.queue.BranchSupport;
@@ -36,9 +35,6 @@ public class CeModule extends Module {
       // Queue
       CeQueueImpl.class,
       BranchSupport.class,
-      ReportSubmitter.class,
-
-      // Core tasks processors
-      ReportTaskProcessor.class);
+      ReportSubmitter.class);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClient.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
index f86a08efb62..f86a08efb62 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
index 1b6a32875c4..1b6a32875c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java
index 17b36c59125..17b36c59125 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/http/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java
index 59c06da2a3f..59c06da2a3f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupport.java
index 96ccac1eb56..96ccac1eb56 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java
index c8a3677cd67..c8a3677cd67 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java
index 260f24b5a0f..260f24b5a0f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java
index 30cdf6ed832..30cdf6ed832 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/package-info.java
index da7a3657d27..da7a3657d27 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentCleanerService.java
index 0b4fe475a7b..0b4fe475a7b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentCleanerService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentFinder.java
index 86259eb3d01..86259eb3d01 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentService.java
index bdef35a72ff..bdef35a72ff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentUpdater.java
index f39283fef5f..f39283fef5f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/NewComponent.java
index 75c0d962f50..75c0d962f50 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/NewComponent.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/package-info.java
index 82634a5336a..82634a5336a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/package-info.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java
index 55fbe2b19ee..8e3143d01b6 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java
@@ -54,8 +54,8 @@ import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toMap;
 import static org.sonar.core.util.stream.MoreCollectors.toHashSet;
 import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
-import static org.sonar.server.util.LanguageParamUtils.getExampleValue;
-import static org.sonar.server.util.LanguageParamUtils.getOrderedLanguageKeys;
+import static org.sonar.server.language.LanguageParamUtils.getExampleValue;
+import static org.sonar.server.language.LanguageParamUtils.getOrderedLanguageKeys;
 import static org.sonar.server.ws.WsParameterBuilder.createQualifiersParameter;
 import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
index 5a5fc63057f..394ae51fb8f 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
@@ -67,7 +67,6 @@ import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.of;
 import static com.google.common.collect.Sets.newHashSet;
-import static java.lang.String.format;
 import static java.util.Collections.emptyMap;
 import static java.util.Objects.requireNonNull;
 import static java.util.Optional.ofNullable;
@@ -80,11 +79,11 @@ import static org.sonar.db.measure.ProjectMeasuresIndexerIterator.METRIC_KEYS;
 import static org.sonar.server.component.ws.ProjectMeasuresQueryFactory.IS_FAVORITE_CRITERION;
 import static org.sonar.server.component.ws.ProjectMeasuresQueryFactory.newProjectMeasuresQuery;
 import static org.sonar.server.component.ws.ProjectMeasuresQueryValidator.NON_METRIC_SORT_KEYS;
+import static org.sonar.server.exceptions.NotFoundException.checkFound;
+import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional;
 import static org.sonar.server.measure.index.ProjectMeasuresIndex.SUPPORTED_FACETS;
 import static org.sonar.server.measure.index.ProjectMeasuresQuery.SORT_BY_LAST_ANALYSIS_DATE;
 import static org.sonar.server.measure.index.ProjectMeasuresQuery.SORT_BY_NAME;
-import static org.sonar.server.exceptions.NotFoundException.checkFound;
-import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.ACTION_SEARCH_PROJECTS;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_FILTER;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteFinder.java
index 0a75c3df70f..0a75c3df70f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteModule.java
index fa5805627c0..fa5805627c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteModule.java
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/favorite/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/package-info.java
index 323232ae563..323232ae563 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/favorite/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java
index c0667dd3363..c0667dd3363 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java
index 90d42e048c4..90d42e048c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthCheck.java
index 66718d4778e..66718d4778e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java
index a9849d135f6..a9849d135f6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java
index bbaa3d5fccd..bbaa3d5fccd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusCheck.java
index 1dbc5fc21ab..1dbc5fc21ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java
index 74df9fd3e50..74df9fd3e50 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java
index 3bfbbaf2c08..3bfbbaf2c08 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthCheckerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthCheckerImpl.java
index eee06d3e35d..eee06d3e35d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/HealthCheckerImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthCheckerImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthReducer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthReducer.java
index 3f5d1d30b4f..3f5d1d30b4f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/HealthReducer.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthReducer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java
index 03abdd08cca..03abdd08cca 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthCheck.java
index 5955347d089..5955347d089 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthModule.java
index 870eae9ae5d..870eae9ae5d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
index 237bb94994b..237bb94994b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java
index 2ee3f57e9e8..2ee3f57e9e8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java
index b25525337f0..b25525337f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java
new file mode 100644
index 00000000000..18ea762c56b
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.server.health;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
index 8f15fc7aa74..8f15fc7aa74 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Action.java
index f409a82b30c..f409a82b30c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Action.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ActionContext.java
index 9f9a12368fe..9f9a12368fe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ActionContext.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AddTagsAction.java
index 27b46a86c93..27b46a86c93 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AddTagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AssignAction.java
index 884fad73b69..884fad73b69 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AssignAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/CommentAction.java
index 1f0e2b573f0..1f0e2b573f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/CommentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java
index b19de964705..b19de964705 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java
index b4805d7e34b..b4805d7e34b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueFinder.java
index 2ac34416a9b..2ac34416a9b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssuesFinderSort.java
index 3694122ddfe..3694122ddfe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssuesFinderSort.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/RemoveTagsAction.java
index 1d0f1d0d7ac..1d0f1d0d7ac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/RemoveTagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Result.java
index 4d09fa750ab..4d09fa750ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Result.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetSeverityAction.java
index 7bd9b2906b0..7bd9b2906b0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetSeverityAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetTypeAction.java
index fb76d59939a..fb76d59939a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetTypeAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionAction.java
index 9ffe778effe..9ffe778effe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionService.java
index 1648de2ad78..1648de2ad78 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/WebIssueStorage.java
index 219a9a9fa39..219a9a9fa39 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/WebIssueStorage.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/package-info.java
index 43edc60ed09..43edc60ed09 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/package-info.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
index 2dce5f3200f..a46e5175c37 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
@@ -23,14 +23,12 @@ import org.sonar.core.platform.Module;
 import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.index.IssueQueryFactory;
-import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.TransitionService;
+import org.sonar.server.issue.WebIssueStorage;
+import org.sonar.server.issue.index.IssueQueryFactory;
 import org.sonar.server.issue.workflow.FunctionExecutor;
 import org.sonar.server.issue.workflow.IssueWorkflow;
 import org.sonar.server.qualitygate.changeevent.QGChangeEventListenersImpl;
-import org.sonar.server.settings.ProjectConfigurationLoaderImpl;
-import org.sonar.server.webhook.WebhookQGChangeEventListener;
 
 public class IssueWsModule extends Module {
   @Override
@@ -63,8 +61,6 @@ public class IssueWsModule extends Module {
       AuthorsAction.class,
       ChangelogAction.class,
       BulkChangeAction.class,
-      ProjectConfigurationLoaderImpl.class,
-      WebhookQGChangeEventListener.class,
       QGChangeEventListenersImpl.class);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/LanguageParamUtils.java
index 3defde1bcc7..bddc1102875 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/LanguageParamUtils.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.server.util;
+package org.sonar.server.language;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java
new file mode 100644
index 00000000000..0898182de08
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.server.language;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueCounter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueCounter.java
index 250629129b8..250629129b8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueCounter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueCounter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java
index 67a5cb12341..67a5cb12341 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java
index a7a9339fa3a..a7a9339fa3a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java
index e7bb34eecbb..e7bb34eecbb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java
index 56dc06dc4c6..56dc06dc4c6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java
index f46daa3255e..e6abc8b2b5c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java
@@ -48,7 +48,7 @@ import org.sonar.server.measure.Rating;
 import org.sonar.server.qualitygate.EvaluatedQualityGate;
 import org.sonar.server.qualitygate.QualityGate;
 import org.sonar.server.qualitygate.changeevent.QGChangeEvent;
-import org.sonar.server.settings.ProjectConfigurationLoader;
+import org.sonar.server.setting.ProjectConfigurationLoader;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Collections.emptyList;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java
index c753200d70e..c753200d70e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java
index 6c0e8962b38..6c0e8962b38 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java
index 95455db3e02..95455db3e02 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java
index 7dac198818c..7dac198818c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/package-info.java
index 3f727297666..3f727297666 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java
index f3b58fe6c02..f3b58fe6c02 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java
index fe8b1821c67..fe8b1821c67 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
index b7d88ae00e1..b7d88ae00e1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
index 488da6d6351..488da6d6351 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
index 947310f2274..947310f2274 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java
index 94ed74562d5..94ed74562d5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
index 3dcfff32d9a..3dcfff32d9a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionUpdater.java
index 876d9026f7c..876d9026f7c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChange.java
index 971d24b1d0d..971d24b1d0d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChange.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java
index 04239af9724..04239af9724 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java
index f9e94ea24b0..516cfd8e590 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java
@@ -24,6 +24,7 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
+import org.sonar.server.platform.SystemInfoWriter;
 import org.sonar.server.user.UserSession;
 
 /**
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
index fb9400b9525..fb9400b9525 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
index 8ed1b406c62..8ed1b406c62 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
index 209fd855df4..d713e6014cd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
@@ -28,8 +28,6 @@ public class QualityGateModule extends Module {
       QualityGateUpdater.class,
       QualityGateConditionsUpdater.class,
       QualityGateFinder.class,
-      QualityGateEvaluatorImpl.class,
-      ProjectsInWarningDaemon.class,
-      ProjectsInWarning.class);
+      QualityGateEvaluatorImpl.class);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java
index 93658d2aa27..93658d2aa27 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java
index 35e0af5fff2..35e0af5fff2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java
index e408251eb19..e408251eb19 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/package-info.java
index 4d247e4707e..4d247e4707e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
index 91a31ca76d9..91a31ca76d9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java
index dd418601955..dd418601955 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java
index 48658b6afd0..48658b6afd0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
index 03bd79fcd43..03bd79fcd43 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java
index 4b65da3c12c..4b65da3c12c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java
index 43e795587ae..43e795587ae 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
index cfecdfdfa28..cfecdfdfa28 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java
index 580f13aa45e..580f13aa45e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java
index 8c514ef4f96..8c514ef4f96 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java
index 79ec59531e8..79ec59531e8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java
index cccdd92bbfc..cccdd92bbfc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java
index f36232b966b..f36232b966b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
index b0f028ea31b..b0f028ea31b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java
index 2f6affebcfa..2f6affebcfa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java
index b8c6b148374..b8c6b148374 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java
index af5f778d0ed..af5f778d0ed 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java
index 4b9df426660..4b9df426660 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/package-info.java
index 5a3c798af36..5a3c798af36 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/package-info.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
index 66d1217bdb6..0b5ccf1df15 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
@@ -20,6 +20,7 @@
 package org.sonar.server.qualityprofile.ws;
 
 import java.io.InputStream;
+import javax.annotation.Nullable;
 import org.sonar.api.profiles.ProfileImporter;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.server.ws.Request;
@@ -38,12 +39,10 @@ import org.sonar.server.qualityprofile.index.ActiveRuleIndexer;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Qualityprofiles.CreateWsResponse;
 
-import javax.annotation.Nullable;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
+import static org.sonar.server.language.LanguageParamUtils.getOrderedLanguageKeys;
 import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam;
-import static org.sonar.server.util.LanguageParamUtils.getOrderedLanguageKeys;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.ACTION_CREATE;
 import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE;
@@ -86,7 +85,7 @@ public class CreateAction implements QProfileWsAction {
     NewAction create = controller.createAction(ACTION_CREATE)
       .setPost(true)
       .setDescription("Create a quality profile.<br>" +
-    "Requires to be logged in and the 'Administer Quality Profiles' permission.")
+        "Requires to be logged in and the 'Administer Quality Profiles' permission.")
       .setResponseExample(getClass().getResource("create-example.json"))
       .setSince("5.2")
       .setHandler(this);
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
index b7a47fcdfa6..110d2e8484f 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
@@ -41,16 +41,16 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.qualityprofile.QProfileDto;
+import org.sonar.server.language.LanguageParamUtils;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.qualityprofile.QProfileExporters;
-import org.sonar.server.util.LanguageParamUtils;
 import org.sonarqube.ws.MediaTypes;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01;
-import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam;
-import static org.sonar.server.exceptions.NotFoundException.checkFound;
 import static org.sonar.server.exceptions.BadRequestException.checkRequest;
+import static org.sonar.server.exceptions.NotFoundException.checkFound;
+import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION;
 import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_KEY;
 import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
index 589298e48dc..27e7c9b27f6 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
@@ -49,7 +49,7 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.util.LanguageParamUtils;
+import org.sonar.server.language.LanguageParamUtils;
 import org.sonarqube.ws.Qualityprofiles.SearchWsResponse;
 import org.sonarqube.ws.Qualityprofiles.SearchWsResponse.QualityProfile;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/NewCustomRule.java
index e64880ceb07..e64880ceb07 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/NewCustomRule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ReactivationException.java
index fcd5db096f2..fcd5db096f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ReactivationException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleCreator.java
index 5a4074a20bd..5a4074a20bd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleCreator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleTagHelper.java
index d96ac1fe8d0..d96ac1fe8d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleTagHelper.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdate.java
index 9df29ada1a9..9df29ada1a9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdate.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdater.java
index 8cf466a23e9..8cf466a23e9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdater.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java
new file mode 100644
index 00000000000..09d28ba5169
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.server.rule;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/EnumUtils.java
index 1a414a85a2d..ca947d51175 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/EnumUtils.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.server.util;
+package org.sonar.server.rule.ws;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
index 31db584f037..40349d60251 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
@@ -34,6 +34,7 @@ import org.sonar.server.rule.index.RuleQuery;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
+import static org.sonar.server.rule.ws.EnumUtils.toEnums;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_ACTIVATION;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_ACTIVE_SEVERITIES;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_AVAILABLE_SINCE;
@@ -55,7 +56,6 @@ import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_STATUSES;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TAGS;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TEMPLATE_KEY;
 import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TYPES;
-import static org.sonar.server.util.EnumUtils.toEnums;
 import static org.sonar.server.exceptions.NotFoundException.checkFound;
 import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional;
 
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java
index f05bffcb860..c04e17871f1 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java
@@ -53,12 +53,13 @@ import org.sonar.db.property.PropertyDto;
 import org.sonar.scanner.protocol.GsonHelper;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.platform.SettingsChangeNotifier;
 import org.sonar.server.setting.ws.SettingValidations.SettingData;
+import org.sonar.server.setting.SettingsChangeNotifier;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
+import static org.sonar.server.exceptions.BadRequestException.checkRequest;
 import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_BRANCH;
 import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_COMPONENT;
 import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_FIELD_VALUES;
@@ -67,7 +68,6 @@ import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_PULL_REQUES
 import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_VALUE;
 import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_VALUES;
 import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
-import static org.sonar.server.exceptions.BadRequestException.checkRequest;
 
 public class SetAction implements SettingsWsAction {
   private static final Collector<CharSequence, ?, String> COMMA_JOINER = Collectors.joining(",");
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/CharactersReader.java
index 64291c4aefd..64291c4aefd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/CharactersReader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/DecorationDataHolder.java
index d667e1e7e11..d667e1e7e11 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/DecorationDataHolder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java
index 7ac5c343234..7ac5c343234 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlTextDecorator.java
index 2cb2fe91e35..2cb2fe91e35 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlTextDecorator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/OpeningHtmlTag.java
index 358f89ffa8f..358f89ffa8f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/OpeningHtmlTag.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/SourceService.java
index 44a3013179d..44a3013179d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/SourceService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/package-info.java
index 81f98ebc983..81f98ebc983 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/Macro.java
index ad847d7e043..ad847d7e043 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/Macro.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/MacroInterpreter.java
index b473ac96a82..b473ac96a82 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/MacroInterpreter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/RuleMacro.java
index 215091d64ca..215091d64ca 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/RuleMacro.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/DeprecatedViews.java
index b8fc0595fc4..b8fc0595fc4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/DeprecatedViews.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageDecorations.java
index c35f7567728..c35f7567728 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageDecorations.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageRepository.java
index b3693678182..a09cfde3104 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageRepository.java
@@ -20,6 +20,7 @@
 package org.sonar.server.ui;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -82,7 +83,7 @@ public class PageRepository implements Startable {
     this.pluginRepository = pluginRepository;
     this.coreExtensionRepository = coreExtensionRepository;
     this.definitions = emptyList();
-    this.corePageDefinitions = copyOf(corePageDefinitions);
+    this.corePageDefinitions = ImmutableList.copyOf(corePageDefinitions);
   }
 
   /**
@@ -93,7 +94,7 @@ public class PageRepository implements Startable {
     this.pluginRepository = pluginRepository;
     this.coreExtensionRepository = coreExtensionRepository;
     this.definitions = copyOf(pageDefinitions);
-    this.corePageDefinitions = copyOf(corePageDefinitions);
+    this.corePageDefinitions = ImmutableList.copyOf(corePageDefinitions);
   }
 
   @Override
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/VersionFormatter.java
index a395c09ae5a..a395c09ae5a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/VersionFormatter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java
index ce2f54f3065..ce2f54f3065 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java
index b82267262cc..b82267262cc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/package-info.java
index 0a8222dc7dd..0a8222dc7dd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java
index 2e935f2fefb..2e935f2fefb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/page/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/package-info.java
index a1b7be58e59..a1b7be58e59 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/page/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/package-info.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java
new file mode 100644
index 00000000000..18a1abfc2a8
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java
@@ -0,0 +1,38 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.server.ce;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class CeModuleTest {
+
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new CeModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5);
+  }
+
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java
index c53cf871bf4..c53cf871bf4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java
index 9768b0cb0fe..9768b0cb0fe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java
index af798ce77aa..af798ce77aa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java
index f8c78ae07dc..f8c78ae07dc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java
index a874f2b6071..a874f2b6071 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java
index 744cf1847d6..744cf1847d6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentFinderTest.java
index dfcae499d22..dfcae499d22 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentFinderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceTest.java
index 4f330773992..4f330773992 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java
index 66583ddfbf2..66583ddfbf2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java
index c8edc8156fa..c8edc8156fa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/NewComponentTest.java
index 10b8505dedb..10b8505dedb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/NewComponentTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/TestComponentFinder.java
index 2e2a9fcc787..2e2a9fcc787 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/TestComponentFinder.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
index 790c4863c17..790c4863c17 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
index c629a4a7bf6..c629a4a7bf6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java
index 82e315e19ec..82e315e19ec 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/ClusterHealthTest.java
index 1265cf8e218..1265cf8e218 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/ClusterHealthTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java
index 4bdc794e71a..4bdc794e71a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
index f8a2c288c8b..f8a2c288c8b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java
index 58d9e8a1cf6..58d9e8a1cf6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthAssert.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthAssert.java
index ec8e06598f4..ec8e06598f4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/HealthAssert.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthAssert.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
index 84893a43792..84893a43792 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthTest.java
index 00452fc0fc5..00452fc0fc5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/HealthTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java
index 4e278877bad..4e278877bad 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
index 72366851eb6..72366851eb6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java
index a18121e0213..a18121e0213 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java
index 05977854180..05977854180 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ActionTest.java
index 16343e1a5ae..16343e1a5ae 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AddTagsActionTest.java
index fe6a79e456f..fe6a79e456f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AddTagsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AssignActionTest.java
index cdfe07d39a4..cdfe07d39a4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AssignActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/CommentActionTest.java
index 2e1d68afb1f..2e1d68afb1f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/CommentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssueFinderTest.java
index 51f1566f9d0..51f1566f9d0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssueFinderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java
index 7d7e2a4bb65..7d7e2a4bb65 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java
index 9ad3bc3d751..9ad3bc3d751 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ResultTest.java
index 9cf037551cb..9cf037551cb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ResultTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregation.java
index fc14607055e..fc14607055e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregation.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregationTest.java
index a22a654980a..a22a654980a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
index 3021160d7ef..3021160d7ef 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
index 2585b44f5b9..2585b44f5b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java
index 59c1cc8d8b9..59c1cc8d8b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionActionTest.java
index 8a2866dfd97..8a2866dfd97 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionServiceTest.java
index 69729235480..69729235480 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionServiceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java
index f103c91017e..f103c91017e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
index b9c68da85d3..25dd711e9dd 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
@@ -30,7 +30,7 @@ public class IssueWsModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new IssueWsModule().configure(container);
-    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 30);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 28);
   }
 }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/LanguageParamUtilsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/LanguageParamUtilsTest.java
index ba47e982444..2af03837c8f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/LanguageParamUtilsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/LanguageParamUtilsTest.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.server.util;
+package org.sonar.server.language;
 
 import org.junit.Test;
 import org.sonar.api.resources.AbstractLanguage;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java
index 5051f4305f7..5051f4305f7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java
index df8fff10315..c3b7eb46d78 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java
@@ -55,8 +55,8 @@ import org.sonar.server.measure.Rating;
 import org.sonar.server.qualitygate.EvaluatedQualityGate;
 import org.sonar.server.qualitygate.QualityGate;
 import org.sonar.server.qualitygate.changeevent.QGChangeEvent;
-import org.sonar.server.settings.ProjectConfigurationLoader;
-import org.sonar.server.settings.TestProjectConfigurationLoader;
+import org.sonar.server.setting.ProjectConfigurationLoader;
+import org.sonar.server.setting.TestProjectConfigurationLoader;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java
index cb271141428..cb271141428 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java
index 7ff3fbfdd51..7ff3fbfdd51 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java
index 35f25724504..35f25724504 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java
index 293e68e7072..293e68e7072 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java
index afa4a39fd03..41add6c83b4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java
@@ -47,7 +47,7 @@ public class ApplyPermissionTemplateQueryTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("Permission template is mandatory");
 
-    ApplyPermissionTemplateQuery.create("", newArrayList("1", "2", "3"));
+    create("", newArrayList("1", "2", "3"));
   }
 
   @Test
@@ -55,6 +55,6 @@ public class ApplyPermissionTemplateQueryTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("No project provided. Please provide at least one project.");
 
-    ApplyPermissionTemplateQuery.create("my_template_key", Collections.emptyList());
+    create("my_template_key", Collections.emptyList());
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java
index 76af5bbe7a2..76af5bbe7a2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java
index 87b5529db46..87b5529db46 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
index b6f9600af1a..b6f9600af1a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
index 2bc2f07606b..2bc2f07606b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java
index 41d48efd496..41d48efd496 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
index b4d2eac3ed2..3a1cc765eec 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.exceptions.ForbiddenException;
+import org.sonar.server.platform.SystemInfoWriter;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -38,7 +39,7 @@ public class InfoActionTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private SystemInfoWriter jsonWriter = new AbstractSystemInfoWriter(null) {
+  private SystemInfoWriter jsonWriter = new SystemInfoWriter() {
     @Override
     public void write(JsonWriter json) {
       json.prop("key", "value");
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
index de93a9d8d1e..c9073795ab4 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.app.ProcessCommandWrapper;
 import org.sonar.server.app.RestartFlagHolder;
+import org.sonar.server.platform.SystemInfoWriter;
 import org.sonar.server.platform.WebServer;
 import org.sonar.server.tester.AnonymousMockUserSession;
 import org.sonar.server.user.UserSession;
@@ -36,7 +37,7 @@ public class SystemWsTest {
   public void define() {
     RestartAction action1 = new RestartAction(mock(UserSession.class), mock(ProcessCommandWrapper.class),
       mock(RestartFlagHolder.class), mock(WebServer.class));
-    InfoAction action2 = new InfoAction(new AnonymousMockUserSession(), mock(AbstractSystemInfoWriter.class));
+    InfoAction action2 = new InfoAction(new AnonymousMockUserSession(), mock(SystemInfoWriter.class));
     SystemWs ws = new SystemWs(action1, action2);
     WebService.Context context = new WebService.Context();
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java
index a3da151ae34..a3da151ae34 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java
index c956b400763..c956b400763 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
index db4417f0247..6e088176fdf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
@@ -30,6 +30,6 @@ public class QualityGateModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new QualityGateModule().configure(container);
-    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 6);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 4);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
index 574903dd0e5..7e053f26a83 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.server.qualitygate;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -32,6 +30,8 @@ import org.sonar.db.DbTester;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.qualitygate.QualityGateDto;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class QualityGateUpdaterTest {
 
   static final String QGATE_NAME = "Default";
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java
index 176e7f3e623..176e7f3e623 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java
index 6bf85ee8932..9e27015bc5f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java
@@ -219,7 +219,7 @@ public class QProfileBackuperImplTest {
   public void fail_to_restore_if_duplicate_rule() throws Exception {
     OrganizationDto organization = db.organizations().insert();
     try {
-      String xml = Resources.toString(getClass().getResource("QProfileBackuperMediumTest/duplicates-xml-backup.xml"), UTF_8);
+      String xml = Resources.toString(getClass().getResource("QProfileBackuperTest/duplicates-xml-backup.xml"), UTF_8);
       underTest.restore(db.getSession(), new StringReader(xml), organization, null);
       fail();
     } catch (IllegalArgumentException e) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java
index 81ce2e33ef6..81ce2e33ef6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java
index a084f72f5b6..a084f72f5b6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
index dd57f191db2..dd57f191db2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java
index 176bddc24c6..176bddc24c6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java
index b53733b9cd1..b53733b9cd1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java
index c2c813f10d8..c2c813f10d8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java
index 88c3a82e875..88c3a82e875 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
index 4339d33c9ba..4339d33c9ba 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java
index 77e3fcc903e..77e3fcc903e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java
index d6a535e448f..d6a535e448f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java
index 6b7d6a6dd73..6b7d6a6dd73 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleCreatorTest.java
index 45bef460214..45bef460214 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleCreatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java
index 90d821e024f..90d821e024f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java
index 7869b26b16a..7869b26b16a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
index 107cd5acc55..f548bbdbe01 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
@@ -57,7 +57,7 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.l18n.I18nRule;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
-import org.sonar.server.platform.SettingsChangeNotifier;
+import org.sonar.server.setting.SettingsChangeNotifier;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.TestResponse;
@@ -96,8 +96,8 @@ public class SetActionTest {
   private SettingsUpdater settingsUpdater = new SettingsUpdater(dbClient, definitions);
   private SettingValidations validations = new SettingValidations(definitions, dbClient, i18n);
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
-  private SetAction underTest = new SetAction(definitions, dbClient, componentFinder, userSession, settingsUpdater, settingsChangeNotifier, validations,
-    new SettingsWsSupport(defaultOrganizationProvider, userSession));
+  private SetAction underTest = new SetAction(definitions, dbClient, componentFinder, userSession, settingsUpdater,
+    settingsChangeNotifier, validations, new SettingsWsSupport(defaultOrganizationProvider, userSession));
 
   private WsActionTester ws = new WsActionTester(underTest);
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java
index dbc493dafd2..dbc493dafd2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java
index ec38ac559e7..ec38ac559e7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java
index 6494abc5897..6494abc5897 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java
index ece48829aa9..ece48829aa9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/SourceServiceTest.java
index 58d1c0b1c79..58d1c0b1c79 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/SourceServiceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/text/MacroInterpreterTest.java
index 9a356bd4ff6..9a356bd4ff6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/text/MacroInterpreterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java
index a25ff785be7..a25ff785be7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageDecorationsTest.java
index f255c619ebe..f255c619ebe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageDecorationsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageRepositoryTest.java
index 6202f24b2a9..6202f24b2a9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageRepositoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/VersionFormatterTest.java
index 35b65e8f720..35b65e8f720 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/VersionFormatterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java
index e7be923df8e..e7be923df8e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
index 3ee9136afeb..f270f7e44f3 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
@@ -34,7 +34,7 @@ import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
 
-import static org.apache.http.HttpStatus.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.user.ws.SetHomepageAction.PARAM_COMPONENT;
 import static org.sonar.server.user.ws.SetHomepageAction.PARAM_TYPE;
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperTest/duplicates-xml-backup.xml
index 4a41aa0b275..4a41aa0b275 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperTest/duplicates-xml-backup.xml
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index 22528ec5f8a..29a0be4224c 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -12,15 +12,25 @@ dependencies {
   compile 'com.google.guava:guava'
   compile 'org.apache.tomcat.embed:tomcat-embed-core'
   compile project(':sonar-core')
+  compile project(':server:sonar-ce-task-projectanalysis')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server')
   compile project(':server:sonar-webserver-webapi')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
+  testCompile 'org.apache.logging.log4j:log4j-api'
+  testCompile 'org.apache.logging.log4j:log4j-core'
+  testCompile 'com.h2database:h2'
   testCompile 'com.google.code.findbugs:jsr305'
+  testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'org.mockito:mockito-core'
   testCompile 'org.eclipse.jetty:jetty-server'
   testCompile 'org.eclipse.jetty:jetty-servlet'
-  testCompile 'org.mockito:mockito-core'
+  testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(':sonar-testing-harness')
 }
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java
index 06b3bb4972b..27ae9fb83ff 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.util.Collection;
 import org.sonar.api.utils.text.JsonWriter;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java
index a883a75c548..36bf38e5aa1 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java
@@ -17,14 +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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.util.List;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.server.ce.http.CeHttpClient;
 import org.sonar.core.util.stream.MoreCollectors;
 import org.sonar.process.systeminfo.SystemInfoSection;
 import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo;
+import org.sonar.server.ce.http.CeHttpClient;
 import org.sonar.server.health.Health;
 import org.sonar.server.health.HealthChecker;
 import org.sonar.server.telemetry.TelemetryDataLoader;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriterModule.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java
index 1da4de96524..e608a80755e 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriterModule.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import org.sonar.core.platform.Module;
 import org.sonar.process.systeminfo.JvmPropertiesSection;
 import org.sonar.process.systeminfo.JvmStateSection;
-import org.sonar.server.platform.WebServer;
 import org.sonar.server.platform.monitoring.DbConnectionSection;
 import org.sonar.server.platform.monitoring.DbSection;
 import org.sonar.server.platform.monitoring.EsIndexesSection;
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index e9cc2faca7c..c9d39d14d9d 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -29,6 +29,7 @@ import org.sonar.api.rules.AnnotationRuleParser;
 import org.sonar.api.rules.XMLRuleParser;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.ce.task.projectanalysis.notification.ReportAnalysisFailureNotificationModule;
+import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor;
 import org.sonar.core.component.DefaultResourceTypes;
 import org.sonar.core.extension.CoreExtensionsInstaller;
 import org.sonar.core.platform.ComponentContainer;
@@ -114,7 +115,7 @@ import org.sonar.server.permission.ws.PermissionsWsModule;
 import org.sonar.server.platform.BackendCleanup;
 import org.sonar.server.platform.ClusterVerification;
 import org.sonar.server.platform.PersistentSettings;
-import org.sonar.server.platform.SettingsChangeNotifier;
+import org.sonar.server.setting.SettingsChangeNotifier;
 import org.sonar.server.platform.WebCoreExtensionsInstaller;
 import org.sonar.server.platform.web.DeprecatedPropertiesWsFilter;
 import org.sonar.server.platform.web.WebServiceFilter;
@@ -125,7 +126,7 @@ import org.sonar.server.platform.ws.HealthCheckerModule;
 import org.sonar.server.platform.ws.L10nWs;
 import org.sonar.server.platform.ws.ServerWs;
 import org.sonar.server.platform.ws.SystemWsModule;
-import org.sonar.server.platform.ws.SystemInfoWriterModule;
+import org.sonar.server.platform.SystemInfoWriterModule;
 import org.sonar.server.plugins.PluginDownloader;
 import org.sonar.server.plugins.PluginUninstaller;
 import org.sonar.server.plugins.ServerExtensionInstaller;
@@ -145,6 +146,7 @@ import org.sonar.server.projectlink.ws.ProjectLinksModule;
 import org.sonar.server.projecttag.ws.ProjectTagsWsModule;
 import org.sonar.server.property.InternalPropertiesImpl;
 import org.sonar.server.property.ws.PropertiesWs;
+import org.sonar.server.qualitygate.ProjectsInWarningModule;
 import org.sonar.server.qualitygate.QualityGateModule;
 import org.sonar.server.qualitygate.notification.QGChangeNotificationHandler;
 import org.sonar.server.qualitygate.ws.QualityGateWsModule;
@@ -180,6 +182,7 @@ import org.sonar.server.rule.ws.RuleWsSupport;
 import org.sonar.server.rule.ws.RulesWs;
 import org.sonar.server.rule.ws.TagsAction;
 import org.sonar.server.setting.ws.SettingsWsModule;
+import org.sonar.server.setting.ProjectConfigurationLoaderImpl;
 import org.sonar.server.source.ws.SourceWsModule;
 import org.sonar.server.startup.LogServerId;
 import org.sonar.server.telemetry.TelemetryClient;
@@ -211,6 +214,7 @@ import org.sonar.server.view.index.ViewIndex;
 import org.sonar.server.view.index.ViewIndexDefinition;
 import org.sonar.server.view.index.ViewIndexer;
 import org.sonar.server.webhook.WebhookModule;
+import org.sonar.server.webhook.WebhookQGChangeEventListener;
 import org.sonar.server.webhook.ws.WebhooksWsModule;
 import org.sonar.server.ws.WebServiceEngine;
 import org.sonar.server.ws.ws.WebServicesWsModule;
@@ -326,6 +330,7 @@ public class PlatformLevel4 extends PlatformLevel {
       TimeMachineWs.class,
 
       QualityGateModule.class,
+      ProjectsInWarningModule.class,
       QualityGateWsModule.class,
 
       // web services
@@ -447,6 +452,7 @@ public class PlatformLevel4 extends PlatformLevel {
       EmailsWsModule.class,
 
       // Settings
+      ProjectConfigurationLoaderImpl.class,
       PersistentSettings.class,
       PropertiesWs.class,
       org.sonar.server.property.ws.IndexAction.class,
@@ -493,6 +499,7 @@ public class PlatformLevel4 extends PlatformLevel {
       ReportAnalysisFailureNotificationModule.class,
       CeModule.class,
       CeWsModule.class,
+      ReportTaskProcessor.class,
 
       // SonarSource editions
       PlatformEditionProvider.class,
@@ -506,6 +513,7 @@ public class PlatformLevel4 extends PlatformLevel {
       RootWsModule.class,
 
       // webhooks
+      WebhookQGChangeEventListener.class,
       WebhookModule.class,
       WebhooksWsModule.class,
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
index 01e9978e0d0..01e9978e0d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
diff --git a/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java
index 29bc924ff25..e48974da9e4 100644
--- a/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java
@@ -17,14 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import org.sonar.api.Plugin;
+package org.sonar.server.qualitygate;
 
-import java.util.Collections;
-import java.util.List;
+import org.sonar.core.platform.Module;
 
-public class CorePlugin extends Plugin {
-
-  public void define(Plugin.Context context) {
+public class ProjectsInWarningModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      ProjectsInWarningDaemon.class,
+      ProjectsInWarning.class
 
+    );
   }
 }
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java
new file mode 100644
index 00000000000..4d247e4707e
--- /dev/null
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.server.qualitygate;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java
index 1b99932ed9b..1b99932ed9b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java
new file mode 100644
index 00000000000..e8782b9c52d
--- /dev/null
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.server.rule;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
index 098302e7816..098302e7816 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java
index 157f43819ea..157f43819ea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java
index 777365d2b62..60820406733 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.io.StringWriter;
 import java.util.Collections;
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java
index ad7e1edd45c..1213c87f39f 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.io.StringWriter;
 import java.util.Optional;
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemInfoWriterModuleTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java
index 664472ef744..a78a5efd40b 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemInfoWriterModuleTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.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.server.platform.ws;
+package org.sonar.server.platform;
 
 import java.util.Collection;
 import org.junit.Test;
 import org.picocontainer.ComponentAdapter;
 import org.sonar.core.platform.ComponentContainer;
-import org.sonar.server.platform.WebServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
index ba56ae7b267..ba56ae7b267 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java
new file mode 100644
index 00000000000..112e10144d2
--- /dev/null
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java
@@ -0,0 +1,37 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.server.qualitygate;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class ProjectsInWarningModuleTest {
+
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new ProjectsInWarningModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 2);
+  }
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
index a557963cee6..a557963cee6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
index 7d82731e6a3..7d82731e6a3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java