clean up sonar-webserver content belonging to sonar-webserver-core

33 files changed, 38 insertions, 13 deletions

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
index f86a08efb62..f86a08efb62 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/package-info.java
index 17b36c59125..17b36c59125 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/package-info.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
index 91a31ca76d9..91a31ca76d9 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
index b0f028ea31b..32a11c072d8 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
@@ -30,7 +30,6 @@ import org.sonar.server.rule.index.RuleQuery;
 
 /**
  * Operations related to activation and deactivation of rules on user profiles.
- * Use {@link BuiltInQProfileUpdate} for built-in profiles.
  */
 @ServerSide
 public interface QProfileRules {
diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
index 106fd158b26..106fd158b26 100644
--- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/package-info.java
new file mode 100644
index 00000000000..5a3c798af36
--- /dev/null
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/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.qualityprofile;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 9ff120d6cfb..8d8daa84ad9 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -1,3 +1,5 @@
+description = 'SonarQube WebServer-only code'
+
 sonarqube {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Web Server :: Core"
@@ -73,6 +75,7 @@ dependencies {
   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(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/CeModule.java
index 033bc5a9253..d8dc4ab0324 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/CeModule.java
@@ -23,8 +23,6 @@ import org.sonar.ce.queue.CeQueueImpl;
 import org.sonar.ce.task.log.CeTaskLogging;
 import org.sonar.core.platform.Module;
 import org.sonar.server.ce.http.CeHttpClientImpl;
-import org.sonar.server.ce.queue.BranchSupport;
-import org.sonar.server.ce.queue.ReportSubmitter;
 
 public class CeModule extends Module {
   @Override
@@ -33,8 +31,6 @@ public class CeModule extends Module {
       CeHttpClientImpl.class,
 
       // Queue
-      CeQueueImpl.class,
-      BranchSupport.class,
-      ReportSubmitter.class);
+      CeQueueImpl.class);
   }
 }
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
index 1b6a32875c4..1b6a32875c4 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/http/package-info.java
index e8782b9c52d..17b36c59125 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/http/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.rule;
+package org.sonar.server.ce.http;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/package-info.java
index 59c06da2a3f..59c06da2a3f 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/ce/package-info.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java
index 27ae9fb83ff..27ae9fb83ff 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java
index 36bf38e5aa1..36bf38e5aa1 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java
index e608a80755e..e608a80755e 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
index 01e9978e0d0..01e9978e0d0 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java
index e48974da9e4..e48974da9e4 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/package-info.java
index 4d247e4707e..4d247e4707e 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/qualitygate/package-info.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RegisterRules.java
index 1b99932ed9b..1b99932ed9b 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RegisterRules.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
index 098302e7816..098302e7816 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/webhook/package-info.java
index 157f43819ea..157f43819ea 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/webhook/package-info.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/ce/CeModuleTest.java
index 18a1abfc2a8..6e82a8685c7 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/ce/CeModuleTest.java
@@ -31,7 +31,7 @@ public class CeModuleTest {
   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);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 3);
   }
 
 
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/ce/http/CeHttpClientImplTest.java
index c53cf871bf4..6258c8395b5 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/ce/http/CeHttpClientImplTest.java
@@ -41,7 +41,7 @@ import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.test.ExceptionCauseMatcher.hasType;
 
-public class CeHttpClientTest {
+public class CeHttpClientImplTest {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
   @Rule
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java
index 60820406733..60820406733 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java
index 1213c87f39f..1213c87f39f 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java
index a78a5efd40b..a78a5efd40b 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
index ba56ae7b267..ba56ae7b267 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
+++ b/server/sonar-webserver-core/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-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java
index 112e10144d2..112e10144d2 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
index a557963cee6..a557963cee6 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
index 7d82731e6a3..7d82731e6a3 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
index 606e655f0bb..02af4469da3 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
@@ -20,11 +20,16 @@
 package org.sonar.server.ce.ws;
 
 import org.sonar.core.platform.Module;
+import org.sonar.server.ce.queue.BranchSupport;
+import org.sonar.server.ce.queue.ReportSubmitter;
 
 public class CeWsModule extends Module {
   @Override
   protected void configureModule() {
     add(
+      BranchSupport.class,
+      ReportSubmitter.class,
+
       CeWs.class,
       ActivityAction.class,
       ActivityStatusAction.class,
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
index 287bf8090a4..4e4bb6ce267 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
@@ -31,6 +31,6 @@ public class CeWsModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new CeWsModule().configure(container);
-    assertThat(container.size()).isEqualTo(16 + COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER);
+    assertThat(container.size()).isEqualTo(18 + COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER);
   }
 }
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
index afcce545257..8ea942e5c24 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.server.ce.http.CeHttpClient;
-import org.sonar.server.ce.http.CeHttpClientImpl;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.log.ServerLogging;
 import org.sonar.server.tester.UserSessionRule;
@@ -41,7 +40,7 @@ public class ChangeLogLevelActionTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   private ServerLogging serverLogging = mock(ServerLogging.class);
-  private CeHttpClient ceHttpClient = mock(CeHttpClientImpl.class);
+  private CeHttpClient ceHttpClient = mock(CeHttpClient.class);
   private ChangeLogLevelAction underTest = new ChangeLogLevelAction(userSession, new ChangeLogLevelStandaloneService(serverLogging, ceHttpClient));
   private WsActionTester actionTester = new WsActionTester(underTest);
 
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index bf7b2cdb8d2..47925090c2f 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -1,4 +1,4 @@
-description = 'SonarQube WebServer'
+description = 'SonarQube WebServer executable and Tomcat directly related code'
 
 sonarqube {
   properties {