SONAR-4908 fix merge

4 files changed, 10 insertions, 10 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index 1b13fb1ad9a..7c01ff6da0c 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -93,12 +93,8 @@ import org.sonar.server.permission.InternalPermissionTemplateService;
 import org.sonar.server.permission.PermissionFinder;
 import org.sonar.server.plugins.*;
 import org.sonar.server.qualityprofile.*;
-import org.sonar.server.rule.DeprecatedRuleDefinitions;
-import org.sonar.server.rule.ProfileRules;
-import org.sonar.server.rule.RubyRuleService;
-import org.sonar.server.rule.RuleRegistry;
+import org.sonar.server.rule.*;
 import org.sonar.server.rules.ProfilesConsole;
-import org.sonar.server.rules.RulesConsole;
 import org.sonar.server.startup.*;
 import org.sonar.server.technicaldebt.InternalRubyTechnicalDebtService;
 import org.sonar.server.technicaldebt.TechnicalDebtFormatter;
@@ -263,7 +259,6 @@ public final class Platform {
     servicesContainer.addSingleton(DefaultRuleFinder.class);
     servicesContainer.addSingleton(DefaultMetricFinder.class);
     servicesContainer.addSingleton(ProfilesConsole.class);
-    servicesContainer.addSingleton(RulesConsole.class);
     servicesContainer.addSingleton(ResourceTypes.class);
     servicesContainer.addSingleton(SettingsChangeNotifier.class);
     servicesContainer.addSingleton(PageDecorations.class);
@@ -335,6 +330,7 @@ public final class Platform {
     // rules
     servicesContainer.addSingleton(RuleRegistry.class);
     servicesContainer.addSingleton(RubyRuleService.class);
+    servicesContainer.addSingleton(RuleRepositories.class);
 
     // technical debt
     servicesContainer.addSingleton(InternalRubyTechnicalDebtService.class);
@@ -379,7 +375,8 @@ public final class Platform {
     startupContainer.addSingleton(GwtPublisher.class);
     startupContainer.addSingleton(RegisterMetrics.class);
     startupContainer.addSingleton(DeprecatedRuleDefinitions.class);
-    startupContainer.addSingleton(RegisterRules.class);
+    startupContainer.addSingleton(RuleDefinitionsLoader.class);
+    startupContainer.addSingleton(RuleRegistration.class);
     startupContainer.addSingleton(RegisterNewProfiles.class);
     startupContainer.addSingleton(JdbcDriverDeployer.class);
     startupContainer.addSingleton(RegisterTechnicalDebtModel.class);
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java
index 8ecd7c1cc6e..78ed353d3c1 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java
@@ -72,7 +72,7 @@ public class RuleRepositories implements ServerComponent {
     /**
      * Kept for backward-compatibility in Ruby code
      */
-    public String getName() {
+    public String getName(boolean b) {
       return name;
     }
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/new_rules_configuration_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/new_rules_configuration_controller.rb
index d40707982e3..13a808a4abb 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/new_rules_configuration_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/new_rules_configuration_controller.rb
@@ -67,7 +67,7 @@ class NewRulesConfigurationController < ApplicationController
 
       @current_rules = result.rules
 
-      @select_repositories = ANY_SELECTION + java_facade.getRuleRepositoriesByLanguage(@profile.language).collect { |repo| [repo.getName(true), repo.getKey()] }.sort
+      @select_repositories = ANY_SELECTION + java_facade.getRuleRepositoriesByLanguage(@profile.language).collect { |repo| [repo.name(), repo.key()] }
       @select_priority = ANY_SELECTION + RULE_PRIORITIES
       @select_activation = [[message('active'), STATUS_ACTIVE], [message('inactive'), STATUS_INACTIVE]]
       @select_inheritance = [[message('any'), 'any'], [message('rules_configuration.not_inherited'), 'NOT'], [message('rules_configuration.inherited'), 'INHERITED'],
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java
index 94b228b516d..cbe48374bdd 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java
@@ -39,8 +39,11 @@ public class RuleRepositoriesTest {
     assertThat(findbugs.key()).isEqualTo("findbugs");
     assertThat(findbugs.name()).isEqualTo("Findbugs");
     assertThat(findbugs.language()).isEqualTo("java");
+
+    // for backward-compatibility
     assertThat(findbugs.getKey()).isEqualTo("findbugs");
-    assertThat(findbugs.getName()).isEqualTo("Findbugs");
+    assertThat(findbugs.getName(false)).isEqualTo("Findbugs");
+    assertThat(findbugs.getName(true)).isEqualTo("Findbugs");
     assertThat(findbugs.getLanguage()).isEqualTo("java");
 
     RuleRepositories.Repository squid = repositories.repository("squid");