From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Wed, 30 Nov 2016 14:13:40 +0000 (+0100)
Subject: Revert "SONAR-8190 remove api/roots/* WS from SQ for release 6.2"
X-Git-Tag: 6.3-RC1~903
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2af122ecc5918e13cd490d40bb7f64acff53990;p=sonarqube.git

Revert "SONAR-8190 remove api/roots/* WS from SQ for release 6.2"

This reverts commit 55fefdf810b8326b803ad8b7ce4f0c047fc57ef1.
---

diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/it/it-tests/src/test/java/it/Category3Suite.java
index 3f54642d88d..198153235d7 100644
--- a/it/it-tests/src/test/java/it/Category3Suite.java
+++ b/it/it-tests/src/test/java/it/Category3Suite.java
@@ -35,6 +35,7 @@ import it.analysis.SettingsEncryptionTest;
 import it.analysis.TempFolderTest;
 import it.measure.DecimalScaleMetricTest;
 import it.organization.OrganizationIt;
+import it.root.RootIt;
 import it.webhook.WebhooksTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -64,8 +65,7 @@ import static util.ItUtils.xooPlugin;
   // organization
   OrganizationIt.class,
   // root users
-  // FIXME root WS disabled for release of SQ 6.2
-//  RootIt.class,
+  RootIt.class,
   WebhooksTest.class
 })
 public class Category3Suite {
diff --git a/it/it-tests/src/test/java/it/organization/OrganizationIt.java b/it/it-tests/src/test/java/it/organization/OrganizationIt.java
index 7a695d34f32..d2a0d3f25a2 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationIt.java
+++ b/it/it-tests/src/test/java/it/organization/OrganizationIt.java
@@ -26,7 +26,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -219,8 +218,6 @@ public class OrganizationIt {
   }
 
   @Test
-  // FIXME disabled because Root WS are removed for release of SQ 6.2
-  @Ignore
   public void create_fails_if_user_is_not_root() {
     userRule.createUser("foo", "bar");
 
diff --git a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
index f14525a0354..57875624b04 100644
--- a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
@@ -23,7 +23,6 @@ import com.sonar.orchestrator.Orchestrator;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.DisableOnDebug;
@@ -61,8 +60,6 @@ public class RestartTest {
   }
 
   @Test
-  // FIXME disabled because Root WS are removed for release of SQ 6.2
-  @Ignore
   public void restart_in_prod_mode_requires_root_and_restarts_WebServer_and_ES() throws Exception {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
diff --git a/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java b/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
index 3e90c1420e1..a2f1c80cf5a 100644
--- a/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
+++ b/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.junit.After;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.Host;
@@ -58,8 +57,6 @@ public class UpdateCenterTest {
   }
 
   @Test
-  // FIXME disabled because Root WS are removed for release of SQ 6.2
-  @Ignore
   public void web_service_installed_plugins_requires_root_and_returns_installed_plugins() {
     userRule.createUser("new_root", "bar");
     userRule.setRoot("new_root");
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 188ed6ff1fa..809e02c0643 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -168,6 +168,7 @@ import org.sonar.server.qualityprofile.ws.OldRestoreAction;
 import org.sonar.server.qualityprofile.ws.ProfilesWs;
 import org.sonar.server.qualityprofile.ws.QProfilesWsModule;
 import org.sonar.server.qualityprofile.ws.SearchDataLoader;
+import org.sonar.server.root.ws.RootWsModule;
 import org.sonar.server.rule.CommonRuleDefinitionsImpl;
 import org.sonar.server.rule.DefaultRuleFinder;
 import org.sonar.server.rule.DeprecatedRulesDefinitionLoader;
@@ -539,8 +540,7 @@ public class PlatformLevel4 extends PlatformLevel {
       NavigationWs.class,
 
       // root
-      // FIXME Root WebServices are disabled in 6.2 release
-//      RootWsModule.class,
+      RootWsModule.class,
 
       // webhooks
       WebhooksWsModule.class,