SONAR-2007 Remove the useless ISO Categories + fix components page

9 files changed, 14 insertions, 16 deletions

diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
index a6b2552c759..2f76ab1d3bd 100644
--- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
@@ -115,7 +115,6 @@ public class RegisterRulesTest extends AbstractDbUnitTestCase {
     assertThat(rule.getDescription(), is("Description of One"));
     assertThat(rule.getPriority(), is(RulePriority.BLOCKER));
     assertThat(rule.getConfigKey(), is("config1"));
-    assertThat(rule.getRulesCategory(), is(Iso9126RulesCategories.EFFICIENCY));
   }
 
   @Test
@@ -178,7 +177,6 @@ class FakeRepository extends RuleRepository {
     Rule rule1 = Rule.create("fake", "rule1", "One");
     rule1.setDescription("Description of One");
     rule1.setPriority(RulePriority.BLOCKER);
-    rule1.setRulesCategory(Iso9126RulesCategories.EFFICIENCY);
     rule1.setConfigKey("config1");
     rule1.createParameter("param1").setDescription("parameter one");
     rule1.createParameter("param2").setDescription("parameter two");
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRuleParameters.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRuleParameters.xml
index 1de750580ab..09b7c3dd728 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRuleParameters.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRuleParameters.xml
@@ -3,7 +3,7 @@
   <rules_categories id="1" name="Efficiency" description="[null]"/>
 
   <rules id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
-                   rules_category_id="[null]" enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]" />
+                   enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]" />
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="[null]"/>
   <rules_parameters id="2" rule_id="1" name="param2" description="[null]" param_type="[null]"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRules.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRules.xml
index 628de2bff46..de7eea07189 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedActiveRules.xml
@@ -1,10 +1,10 @@
 <dataset>
 
   <rules id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="[null]"/>
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedRules.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedRules.xml
index b2e95b913f9..88e3ae88436 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedRules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableDeprecatedRules.xml
@@ -1,10 +1,10 @@
 <dataset>
 
   <rules id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="[null]"/>
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableUserRulesIfParentIsDisabled.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableUserRulesIfParentIsDisabled.xml
index f3b1d4197ab..a4cef9f0ff2 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableUserRulesIfParentIsDisabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/disableUserRulesIfParentIsDisabled.xml
@@ -1,10 +1,10 @@
 <dataset>
 
   <rules id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
-                   rules_category_id="[null]" enabled="false" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
+                   enabled="false" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
   <!-- user rule duplicated from rule 1. It is currently enabled. -->
   <rules id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="1"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="1"/>
 
 </dataset>
\ No newline at end of file
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/doNotDisableUserRulesIfParentIsEnabled.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/doNotDisableUserRulesIfParentIsEnabled.xml
index c53aea894ee..6bd9cbd416a 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/doNotDisableUserRulesIfParentIsEnabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/doNotDisableUserRulesIfParentIsEnabled.xml
@@ -1,9 +1,9 @@
 <dataset>
 
   <rules id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
   <rules id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="1"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="1"/>
 
 </dataset>
\ No newline at end of file
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/shared.xml
index 78595a57e1c..36ee1b8bc69 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/shared.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/shared.xml
@@ -1,7 +1,7 @@
 <dataset>
 
   <rules id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
-                   rules_category_id="[null]" enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="[null]"/>
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updadeRuleFields.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updadeRuleFields.xml
index 5afdf8901b9..cd931c60c73 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updadeRuleFields.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updadeRuleFields.xml
@@ -3,10 +3,10 @@
   <rules_categories id="1" name="Efficiency" description="[null]"/>
 
   <rules id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
-                   rules_category_id="[null]" enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
-                   rules_category_id="[null]" enabled="true" priority="1" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="[null]"/>
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updateRuleParameters.xml b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updateRuleParameters.xml
index b077b4f9663..fca8cf64b12 100644
--- a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updateRuleParameters.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/startup/RegisterRulesTest/updateRuleParameters.xml
@@ -3,10 +3,10 @@
   <rules_categories id="1" name="Efficiency" description="[null]"/>
 
   <rules id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
-                   rules_category_id="[null]" enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]"/>
+                   enabled="true" priority="2" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
-                   rules_category_id="[null]" enabled="true" priority="1" cardinality="SINGLE" parent_id="[null]"/>
+                  enabled="true" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="param1" description="old description" param_type="[null]"/>
   <rules_parameters id="2" rule_id="1" name="deprecated_param" description="deprecated param to be removed" param_type="[null]"/>