SONAR-1722 increase the size of RULES_PROFILES.PARENT_NAME (same as NAME) + change...

diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml
index 808647dd2aaa1a83c89ebcaeb15d76e48d3bc1d9..cd31402ceb14f9e5685e13621f357fa68291e601 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml
@@ -10,7 +10,7 @@
   <rules_parameters id="1" rule_id="1" name="param1" description="foo" param_type="r"/>
 
   <!-- Active rule created -->
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
   <!-- Active rule param created -->
   <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="20"/>

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
index 1ebab335157edd853e3450c3e8e099038e6674e0..c2d33ec2eb55711cac64b09d2526182f9f8d4719 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
@@ -37,6 +37,9 @@ import javax.persistence.*;
 @Table(name = "active_rules")
 public class ActiveRule implements Cloneable {
 
+  public static final String INHERITED = "INHERITED";
+  public static final String OVERRIDES = "OVERRIDES";
+
   @Id
   @Column(name = "id")
   @GeneratedValue
@@ -57,9 +60,8 @@ public class ActiveRule implements Cloneable {
   @OneToMany(mappedBy = "activeRule", fetch = FetchType.LAZY, cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REMOVE })
   private List<ActiveRuleParam> activeRuleParams = new ArrayList<ActiveRuleParam>();
 
-  @Column(name = "inherited", updatable = true, nullable = true)
-  @Enumerated(EnumType.ORDINAL)
-  private ActiveRuleInheritanceStatus inherited = ActiveRuleInheritanceStatus.NO;
+  @Column(name = "inheritance", updatable = true, nullable = true)
+  private String inheritance;
 
   /**
    * @deprecated visibility should be reduced to protected or package
@@ -92,8 +94,8 @@ public class ActiveRule implements Cloneable {
    * 
    * @since 2.5
    */
-  public ActiveRuleInheritanceStatus getInheritanceStatus() {
-    return inherited == null ? ActiveRuleInheritanceStatus.NO : inherited;
+  public String getInheritance() {
+    return inheritance;
   }
 
   /**
@@ -101,8 +103,16 @@ public class ActiveRule implements Cloneable {
    * 
    * @since 2.5
    */
-  public void setInheritanceStatus(ActiveRuleInheritanceStatus status) {
-    this.inherited = status;
+  public void setInheritance(String s) {
+    this.inheritance = s;
+  }
+
+  public boolean isInherited() {
+    return StringUtils.equals(INHERITED, inheritance);
+  }
+
+  public boolean doesOverride() {
+    return StringUtils.equals(OVERRIDES, inheritance);
   }
 
   /**
@@ -259,7 +269,7 @@ public class ActiveRule implements Cloneable {
   @Override
   public Object clone() {
     final ActiveRule clone = new ActiveRule(getRulesProfile(), getRule(), getSeverity());
-    clone.setInheritanceStatus(getInheritanceStatus());
+    clone.setInheritance(getInheritance());
     if (CollectionUtils.isNotEmpty(getActiveRuleParams())) {
       clone.setActiveRuleParams(new ArrayList<ActiveRuleParam>(CollectionUtils.collect(getActiveRuleParams(), new Transformer() {
         public Object transform(Object input) {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleInheritanceStatus.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleInheritanceStatus.java
deleted file mode 100644 (file)
index 27c7e41..0000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleInheritanceStatus.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar 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.
- *
- * Sonar 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 Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.api.rules;
-
-/**
- * For internal use only.
- * 
- * @since 2.5
- */
-public enum ActiveRuleInheritanceStatus {
-  /**
-   * WARNING : DO NOT CHANGE THE ENUMERATION ORDER
-   * the enum ordinal is used for db persistence
-   */
-  NO, INHERITED, OVERRIDDEN
-}

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
index 2ca434ee7eefa63ffa99fa0aaf04f21fec5da11b..854ef5c8594004ac87f79be3e722090130bfd7cd 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java
@@ -169,7 +169,7 @@ public class ProfilesBackup implements Backupable {
         writeNode(writer, "key", rule.getRule().getKey());
         writeNode(writer, "plugin", rule.getRule().getRepositoryKey());
         writeNode(writer, "level", rule.getSeverity().name());
-        writeNode(writer, "inherited", rule.getInheritanceStatus().toString());
+        writeNode(writer, "inheritance", rule.getInheritance());
 
         if (!rule.getActiveRuleParams().isEmpty()) {
           writer.startNode("params");
@@ -205,8 +205,8 @@ public class ProfilesBackup implements Backupable {
         ActiveRule activeRule = new ActiveRule(null, new Rule(valuesRule.get("plugin"), valuesRule.get("key")), RulePriority
             .valueOf(valuesRule.get("level")));
         activeRule.setActiveRuleParams(params);
-        if (valuesRule.containsKey("inherited")) {
-          activeRule.setInheritanceStatus(ActiveRuleInheritanceStatus.valueOf(valuesRule.get("inherited")));
+        if (valuesRule.containsKey("inheritance")) {
+          activeRule.setInheritance(valuesRule.get("inheritance"));
         }
         return activeRule;
       }
@@ -218,9 +218,11 @@ public class ProfilesBackup implements Backupable {
   }
 
   private void writeNode(HierarchicalStreamWriter writer, String name, String value) {
-    writer.startNode(name);
-    writer.setValue(value);
-    writer.endNode();
+    if (value != null) {
+      writer.startNode(name);
+      writer.setValue(value);
+      writer.endNode();
+    }
   }
 
   private Map<String, String> readNode(HierarchicalStreamReader reader) {

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
index a1ad040d321914dc7eaf678ff5a0e630ef72ec98..98f1dc6ca76eaca55bb001a537bbe3b46d0cba3f 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.server.configuration;
 
-import org.sonar.api.rules.ActiveRuleInheritanceStatus;
-
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.model.ResourceModel;
 import org.sonar.api.profiles.RulesProfile;
@@ -122,8 +120,8 @@ public class ProfilesManager extends BaseDao {
    */
   public void activatedOrChanged(int parentProfileId, int activeRuleId) {
     ActiveRule parentActiveRule = getSession().getEntity(ActiveRule.class, activeRuleId);
-    if (parentActiveRule.getInheritanceStatus() == ActiveRuleInheritanceStatus.INHERITED) {
-      parentActiveRule.setInheritanceStatus(ActiveRuleInheritanceStatus.OVERRIDDEN);
+    if (parentActiveRule.isInherited()) {
+      parentActiveRule.setInheritance(ActiveRule.OVERRIDES);
       getSession().saveWithoutFlush(parentActiveRule);
     }
     for (RulesProfile child : getChildren(parentProfileId)) {
@@ -159,12 +157,12 @@ public class ProfilesManager extends BaseDao {
   public void revert(int profileId, int activeRuleId) {
     RulesProfile profile = getSession().getEntity(RulesProfile.class, profileId);
     ActiveRule activeRule = getSession().getEntity(ActiveRule.class, activeRuleId);
-    if (activeRule != null && activeRule.getInheritanceStatus() == ActiveRuleInheritanceStatus.OVERRIDDEN) {
+    if (activeRule != null && activeRule.doesOverride()) {
       ActiveRule parentActiveRule = getParentProfile(profile).getActiveRule(activeRule.getRule());
       removeActiveRule(profile, activeRule);
       activeRule = (ActiveRule) parentActiveRule.clone();
       activeRule.setRulesProfile(profile);
-      activeRule.setInheritanceStatus(ActiveRuleInheritanceStatus.INHERITED);
+      activeRule.setInheritance(ActiveRule.INHERITED);
       profile.getActiveRules().add(activeRule);
       getSession().saveWithoutFlush(activeRule);
 
@@ -179,17 +177,17 @@ public class ProfilesManager extends BaseDao {
   private void activateOrChange(RulesProfile profile, ActiveRule parentActiveRule) {
     ActiveRule activeRule = profile.getActiveRule(parentActiveRule.getRule());
     if (activeRule != null) {
-      if (activeRule.getInheritanceStatus() == ActiveRuleInheritanceStatus.INHERITED) {
+      if (activeRule.isInherited()) {
         removeActiveRule(profile, activeRule);
       } else {
-        activeRule.setInheritanceStatus(ActiveRuleInheritanceStatus.OVERRIDDEN);
+        activeRule.setInheritance(ActiveRule.OVERRIDES);
         getSession().saveWithoutFlush(activeRule);
         return; // no need to change in children
       }
     }
     activeRule = (ActiveRule) parentActiveRule.clone();
     activeRule.setRulesProfile(profile);
-    activeRule.setInheritanceStatus(ActiveRuleInheritanceStatus.INHERITED);
+    activeRule.setInheritance(ActiveRule.INHERITED);
     profile.getActiveRules().add(activeRule);
     getSession().saveWithoutFlush(activeRule);
 
@@ -201,10 +199,10 @@ public class ProfilesManager extends BaseDao {
   private void deactivate(RulesProfile profile, Rule rule) {
     ActiveRule activeRule = profile.getActiveRule(rule);
     if (activeRule != null) {
-      if (activeRule.getInheritanceStatus() == ActiveRuleInheritanceStatus.INHERITED) {
+      if (activeRule.isInherited()) {
         removeActiveRule(profile, activeRule);
       } else {
-        activeRule.setInheritanceStatus(ActiveRuleInheritanceStatus.NO);
+        activeRule.setInheritance(null);
         getSession().saveWithoutFlush(activeRule);
         return; // no need to change in children
       }

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb
index cc325a3ccbc7acadf131cffa38eda06fb3f7a9aa..83bce7e376b1f88865195e84b4696c9ca0eb3cbb 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb
@@ -101,10 +101,10 @@ class ActiveRule < ActiveRecord::Base
   end\r
 \r
   def inherited?\r
-    inherited==1\r
+    inheritance=='INHERITED'\r
   end\r
 \r
-  def overridden?\r
-    inherited==2\r
+  def overrides?\r
+    inheritance=='OVERRIDES'\r
   end\r
 end\r

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index e5511c1619640d1eb278a74376d4311ba98c74fa..52be4b10fcd1fbb93313cefd8fb48c54ee195723 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -14,15 +14,15 @@
                  :loading => "$('levels_#{rule.id}').replace('<img src=\"#{ApplicationController.root_context}/images/loading.gif\"/>');",
                  :with => "'level=' + get_level_for_rule(#{rule_select_box},#{rule_check_box})")
       %>
-      <%= check_box_tag(check_box_id, 'yes', (!active_rule.nil?), :onclick => activate_rule, :disabled => !enable_modification || (active_rule && (active_rule.inherited? || active_rule.overridden?))) %>
+      <%= check_box_tag(check_box_id, 'yes', (!active_rule.nil?), :onclick => activate_rule, :disabled => !enable_modification || (active_rule && (active_rule.inherited? || active_rule.overrides?))) %>
       <%= select_tag(select_box_id, options_for_select(RulesConfigurationController::RULE_PRIORITIES, (active_rule.nil? ? rule.priority_text : active_rule.priority_text)),
             {:onchange => changel_level, :disabled => (!(enable_modification) || active_rule.nil?)}) %>
 
       <% if active_rule %>
         <% if active_rule.inherited? %>
-          <img src="<%= ApplicationController.root_context -%>/images/relation-vertical-green.png" alt="Inherited from parent" title="Inherited from parent"/>
-        <% elsif active_rule.overridden? %>
-          <img src="<%= ApplicationController.root_context -%>/images/relation-vertical-red.png" alt="Overrides parent definition" title="Overrides parent definition"/>
+          <img src="<%= ApplicationController.root_context -%>/images/inherited.png" alt="Inherited from parent" title="Inherited from parent"/>
+        <% elsif active_rule.overrides? %>
+          <img src="<%= ApplicationController.root_context -%>/images/overrides.png" alt="Overrides parent definition" title="Overrides parent definition"/>
         <% end %>
       <% end %>
   </form>
@@ -56,7 +56,7 @@
         <% if rule.editable? %>
         <%= button_to "Edit rule", :action => 'edit', :id => profile.id, :rule_id => rule.id %>
         <% end %>
-        <% if active_rule && active_rule.overridden? %>
+        <% if active_rule && active_rule.overrides? %>
         <%= button_to "Revert to parent definition", :action => 'revert_rule', :id => profile.id, :active_rule_id => active_rule.id %><br/>
         <% end %>
       <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
index c7b238473d99c4ae5387db7e1468db61f747cec4..62775358dde47bfd18e9fe5e9127af72d901150a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb
@@ -24,11 +24,10 @@
 class AddColumnsForProfilesInheritance < ActiveRecord::Migration
 
   def self.up
-    add_column 'active_rules', 'inherited', :integer, :null => true
+    add_column 'active_rules', 'inheritance', :varchar, :limit => 10, :null => true
     ActiveRule.reset_column_information
-    ActiveRule.update_all(ActiveRule.sanitize_sql_for_assignment({:inherited => 0}))
-
-    add_column 'rules_profiles', 'parent_name', :string, :limit => 40, :null => true
+    
+    add_column 'rules_profiles', 'parent_name', :string, :limit => 100, :null => true
     Profile.reset_column_information
   end
 

diff --git a/sonar-server/src/main/webapp/images/inherited.png b/sonar-server/src/main/webapp/images/inherited.png
new file mode 100644 (file)
index 0000000..e193d53
Binary files /dev/null and b/sonar-server/src/main/webapp/images/inherited.png differ

diff --git a/sonar-server/src/main/webapp/images/overrides.png b/sonar-server/src/main/webapp/images/overrides.png
new file mode 100644 (file)
index 0000000..3518669
Binary files /dev/null and b/sonar-server/src/main/webapp/images/overrides.png differ

diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java b/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
index 0abc449a411f4d6da62a31e5764ef3098e231bbc..c6e72df8451f94544b07147ef3e80d5147332a09 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/configuration/BackupTest.java
@@ -25,6 +25,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.CharEncoding;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
+import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.configuration.Property;
@@ -128,7 +129,7 @@ public class BackupTest {
     assertNotNull(testActiveRule.getRule());
     assertEquals("test key", testActiveRule.getRule().getKey());
     assertEquals("test plugin", testActiveRule.getRule().getRepositoryKey());
-    assertThat(testActiveRule.getInheritanceStatus(), is(ActiveRuleInheritanceStatus.NO));
+    assertThat(testActiveRule.getInheritance(), nullValue());
     assertEquals(1, testActiveRule.getActiveRuleParams().size());
 
     ActiveRuleParam testActiveRuleParam = testActiveRule.getActiveRuleParams().get(0);
@@ -149,7 +150,7 @@ public class BackupTest {
     assertEquals("test2 name", testProfile.getName());
     assertEquals("test name", testProfile.getParentName());
     testActiveRule = testProfile.getActiveRules().get(0);
-    assertThat(testActiveRule.getInheritanceStatus(), is(ActiveRuleInheritanceStatus.OVERRIDDEN));
+    assertThat(testActiveRule.getInheritance(), is(ActiveRule.OVERRIDES));
 
     Collection<Rule> rules = sonarConfig.getRules();
     assertThat(rules.size(), is(1));
@@ -181,7 +182,7 @@ public class BackupTest {
     RulesProfile testProfile = profiles.iterator().next();
     assertThat(testProfile.getActiveRules().size(), is(1));
     ActiveRule activeRule = testProfile.getActiveRules().get(0);
-    assertThat(activeRule.getInheritanceStatus(), is(ActiveRuleInheritanceStatus.NO));
+    assertThat(activeRule.getInheritance(), nullValue());
   }
 
   @Test
@@ -283,7 +284,7 @@ public class BackupTest {
 
     ActiveRule activeRule2 = profile2.activateRule(rule, RulePriority.MINOR);
     activeRule2.setParameter("test param key", "test value");
-    activeRule2.setInheritanceStatus(ActiveRuleInheritanceStatus.OVERRIDDEN);
+    activeRule2.setInheritance(ActiveRule.OVERRIDES);
 
     profiles.get(0).getAlerts().add(new Alert(null, new Metric("test key"), Alert.OPERATOR_GREATER, "testError", "testWarn"));
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
index afbcd51f3e1f0b9ae85d9e3718e7f9f2b7577bd9..f61e6e67c4b19bcb32addb990cf5c9c94485c65d 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml
@@ -42,7 +42,6 @@
           <key><![CDATA[test key]]></key>
           <plugin><![CDATA[test plugin]]></plugin>
           <level><![CDATA[ERROR]]></level>
-          <inherited><![CDATA[NO]]></inherited>
           <params>
             <param>
               <key><![CDATA[test param key]]></key>
@@ -71,7 +70,7 @@
           <key><![CDATA[test key]]></key>
           <plugin><![CDATA[test plugin]]></plugin>
           <level><![CDATA[ERROR]]></level>
-          <inherited><![CDATA[OVERRIDDEN]]></inherited>
+          <inheritance><![CDATA[OVERRIDES]]></inheritance>
           <params>
             <param>
               <key><![CDATA[test param key]]></key>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
index 55e7c52ef69950f0e7f4eb3efbea722f1bc28942..fb024b6d4190f848090e7b25876188b24d52d5ec 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml
@@ -44,7 +44,6 @@
           <key><![CDATA[test key]]></key>
           <plugin><![CDATA[test plugin]]></plugin>
           <level><![CDATA[MAJOR]]></level>
-          <inherited><![CDATA[NO]]></inherited>
           <params>
             <param>
               <key><![CDATA[test param key]]></key>
@@ -73,7 +72,7 @@
           <key><![CDATA[test key]]></key>
           <plugin><![CDATA[test plugin]]></plugin>
           <level><![CDATA[MINOR]]></level>
-          <inherited><![CDATA[OVERRIDDEN]]></inherited>
+          <inheritance><![CDATA[OVERRIDES]]></inheritance>
           <params>
             <param>
               <key><![CDATA[test param key]]></key>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
index 3ce3a26819718b770f92db71c26814103e114560..dff950338514cc4bcb18f9baddf4c0aa38152fdd 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml
@@ -9,10 +9,10 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
   <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="30"/>
   
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="1"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inheritance="INHERITED"/>
   <active_rule_parameters id="2" active_rule_id="2" rules_parameter_id="1" value="30"/>
   
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
index 5df60edae3de61cc88185a3990a352b8e6c8ad03..4b5559604476cbd78cf7d83303e9188c2abf7606 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml
@@ -9,7 +9,7 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
   <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="30"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
index e1c19620adb6ed60f42b4fe40e12963b02ff0381..1f7efb177a9e7cd08121a8e72d202c7194b9abf2 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml
@@ -12,10 +12,10 @@
   
   <rules_profiles id="3" provided="false" name="child" default_profile="0" language="java" parent_name="new_parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="0"/>
+  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inheritance="[null]"/>
   
-  <active_rules id="4" profile_id="3" rule_id="2" failure_level="2" inherited="1"/>
+  <active_rules id="4" profile_id="3" rule_id="2" failure_level="2" inheritance="INHERITED"/>
   
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
index 958b9a980310806ec27ecd2139635a7a640a1bf4..ba8530b21f7f53f8ecb7338fb1354d861d2b2d46 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml
@@ -12,10 +12,10 @@
   
   <rules_profiles id="3" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inherited="0"/>
+  <active_rules id="2" profile_id="2" rule_id="2" failure_level="2" inheritance="[null]"/>
   
-  <active_rules id="3" profile_id="3" rule_id="1" failure_level="2" inherited="1"/>
+  <active_rules id="3" profile_id="3" rule_id="1" failure_level="2" inheritance="INHERITED"/>
   
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
index e51993058f644409d3346ffb8418188320d958ee..9a2c56efae83482345afe00dae3316dd3248f697 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
index 2d08e30f5a348505f647fe2ac07066e2b16dda00..4760d12b7d93d376241a8553871620e19821196f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="1"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inheritance="INHERITED"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
index 93223e48dfc6af2daa1fe03bdc8b450daf8d170f..1493a8e8897dd9cd0e70e1d14c4b77fccef12685 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="[null]"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
index 2d08e30f5a348505f647fe2ac07066e2b16dda00..4760d12b7d93d376241a8553871620e19821196f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="1"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inheritance="INHERITED"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
index 2d08e30f5a348505f647fe2ac07066e2b16dda00..4760d12b7d93d376241a8553871620e19821196f 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml
@@ -7,8 +7,8 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="parent"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
-  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inherited="1"/>
+  <active_rules id="2" profile_id="2" rule_id="1" failure_level="2" inheritance="INHERITED"/>
 
 </dataset>

diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
index 93223e48dfc6af2daa1fe03bdc8b450daf8d170f..1493a8e8897dd9cd0e70e1d14c4b77fccef12685 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml
@@ -7,6 +7,6 @@
   
   <rules_profiles id="2" provided="false" name="child" default_profile="0" language="java" parent_name="[null]"/>
 
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="0"/>
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inheritance="[null]"/>
 
 </dataset>