diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-02-01 17:05:41 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-02-01 17:05:42 +0100 |
| commit | 61f369c008de87495d833aea8be36eb065fb8d31 (patch) | |
| tree | 2f443add013414b109f6fd16a0e3a0381e457c36 /sonar-server | |
| parent | 281918aba787280839c9b6899e57309f08077b08 (diff) | |
| download | sonarqube-61f369c008de87495d833aea8be36eb065fb8d31.tar.gz sonarqube-61f369c008de87495d833aea8be36eb065fb8d31.zip | |
Move all QProfile related classes to org.sonar.server.qualityprofile
Diffstat (limited to 'sonar-server')
62 files changed, 20 insertions, 476 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 90a071daa43..4d9ac55497e 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 @@ -74,7 +74,7 @@ import org.sonar.jpa.session.ThreadLocalDatabaseSessionFactory; import org.sonar.server.charts.ChartFactory; import org.sonar.server.component.DefaultComponentFinder; import org.sonar.server.component.DefaultRubyComponentService; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.db.EmbeddedDatabaseFactory; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.db.migrations.DatabaseMigrations; diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesBackup.java index e18c9f9c5d8..7c1cf830170 100644 --- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesBackup.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; @@ -34,6 +34,7 @@ import org.sonar.api.profiles.RulesProfile; import org.sonar.api.rules.*; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.dao.RulesDao; +import org.sonar.server.configuration.SonarConfig; import java.util.*; @@ -126,7 +127,7 @@ public class ProfilesBackup { private void importAlerts(RulesProfile profile) { if (profile.getAlerts() != null) { - for (Iterator<Alert> ia = profile.getAlerts().iterator(); ia.hasNext();) { + for (Iterator<Alert> ia = profile.getAlerts().iterator(); ia.hasNext(); ) { Alert alert = ia.next(); Metric unMarshalledMetric = alert.getMetric(); String validKey = unMarshalledMetric.getKey(); @@ -143,7 +144,7 @@ public class ProfilesBackup { } private void importActiveRules(RulesDao rulesDao, RulesProfile profile) { - for (Iterator<ActiveRule> iar = profile.getActiveRules(true).iterator(); iar.hasNext();) { + for (Iterator<ActiveRule> iar = profile.getActiveRules(true).iterator(); iar.hasNext(); ) { ActiveRule activeRule = iar.next(); Rule unMarshalledRule = activeRule.getRule(); Rule matchingRuleInDb = rulesDao.getRuleByKey(unMarshalledRule.getRepositoryKey(), unMarshalledRule.getKey()); @@ -155,7 +156,7 @@ public class ProfilesBackup { activeRule.setRule(matchingRuleInDb); activeRule.setRulesProfile(profile); activeRule.getActiveRuleParams(); - for (Iterator<ActiveRuleParam> irp = activeRule.getActiveRuleParams().iterator(); irp.hasNext();) { + for (Iterator<ActiveRuleParam> irp = activeRule.getActiveRuleParams().iterator(); irp.hasNext(); ) { ActiveRuleParam activeRuleParam = irp.next(); RuleParam unMarshalledRP = activeRuleParam.getRuleParam(); RuleParam matchingRPInDb = rulesDao.getRuleParam(matchingRuleInDb, unMarshalledRP.getKey()); diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesManager.java index 717b168f66f..c1f636dc25a 100644 --- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesManager.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import com.google.common.collect.Lists; import org.apache.commons.lang.ObjectUtils; @@ -31,7 +31,6 @@ import org.sonar.jpa.dao.RulesDao; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - import java.util.List; public class ProfilesManager extends BaseDao { diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java index 022de16f19c..99f5d1cc555 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java @@ -37,7 +37,6 @@ import org.sonar.core.qualityprofile.db.*; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.user.UserSession; import org.sonar.server.util.TypeValidations; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java index c53705c7696..7f40c7079ae 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java @@ -31,7 +31,6 @@ import org.sonar.core.properties.PropertyDto; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.user.UserSession; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java index 938ddfb90da..26549264a4d 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java @@ -36,7 +36,7 @@ import org.sonar.check.Cardinality; import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.*; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 307e7b61f58..0ac545ac080 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -46,7 +46,7 @@ import org.sonar.core.purge.PurgeDao; import org.sonar.core.resource.ResourceIndexerDao; import org.sonar.core.resource.ResourceKeyUpdaterDao; import org.sonar.core.timemachine.Periods; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.db.migrations.DatabaseMigrator; import org.sonar.server.platform.Platform; import org.sonar.server.platform.ServerIdGenerator; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/InheritedProfilesTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/InheritedProfilesTest.java index b47906fe862..c17c4faf1ef 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/InheritedProfilesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/InheritedProfilesTest.java @@ -17,18 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; public class InheritedProfilesTest extends AbstractDbUnitTestCase { - private ProfilesManager profilesManager; + ProfilesManager profilesManager; @Before public void setUp() { diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesBackupTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesBackupTest.java index 2b74446d91a..102f58d6abc 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesBackupTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesBackupTest.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; import org.sonar.api.profiles.RulesProfile; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.configuration.SonarConfig; +import org.sonar.server.qualityprofile.ProfilesBackup; import java.util.Arrays; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesManagerTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesManagerTest.java index 84d3c31a668..f8d3adfa8bd 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesManagerTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesManagerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; @@ -27,6 +27,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java index a5f286dc3eb..ce3fa00d0f9 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java @@ -41,7 +41,6 @@ import org.sonar.core.qualityprofile.db.*; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.user.MockUserSession; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java index c72d4091ba1..3848a6e3799 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java @@ -39,7 +39,6 @@ import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.qualityprofile.db.ActiveRuleDto; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleChangeTest.java index 23da77803a7..55a19b98a5a 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleChangeTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; @@ -27,6 +27,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java index 1613c31d655..a1603ac6345 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java @@ -30,7 +30,7 @@ import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleTagDao; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml deleted file mode 100644 index d6e3147ca63..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> -</sonar-config> 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 deleted file mode 100644 index c425caf0fc9..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml +++ /dev/null @@ -1,110 +0,0 @@ -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <metrics> - <metric> - <key><![CDATA[metric1]]></key> - <description><![CDATA[metric1]]></description> - <type><![CDATA[INT]]></type> - <direction><![CDATA[-1]]></direction> - <name><![CDATA[metric1]]></name> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[GUI]]></origin> - </metric> - <metric> - <key><![CDATA[metric2]]></key> - <description><![CDATA[metric2]]></description> - <type><![CDATA[INT]]></type> - <direction><![CDATA[-1]]></direction> - <name><![CDATA[metric2]]></name> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[WS]]></origin> - </metric> - </metrics> - <properties> - <property> - <key><![CDATA[key1]]></key> - <value><![CDATA[value1]]></value> - </property> - <property> - <key><![CDATA[key2]]></key> - <value><![CDATA[value2]]></value> - </property> - </properties> - <profiles> - <profile> - <name><![CDATA[test name]]></name> - <default-profile><![CDATA[true]]></default-profile> - <provided><![CDATA[true]]></provided> - <language><![CDATA[test language]]></language> - <active-rules> - <active-rule> - <key><![CDATA[test key]]></key> - <plugin><![CDATA[test plugin]]></plugin> - <level><![CDATA[ERROR]]></level> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test value]]></value> - </param> - </params> - </active-rule> - </active-rules> - <alerts> - <alert> - <operator><![CDATA[>]]></operator> - <value-error><![CDATA[testError]]></value-error> - <value-warning><![CDATA[testWarn]]></value-warning> - <metric-key><![CDATA[test key]]></metric-key> - </alert> - <alert> - <operator><![CDATA[<]]></operator> - <value-error><![CDATA[testError2]]></value-error> - <value-warning><![CDATA[testWarn2]]></value-warning> - <period><![CDATA[1]]></period> - <metric-key><![CDATA[test key2]]></metric-key> - </alert> - </alerts> - </profile> - <profile> - <name><![CDATA[test2 name]]></name> - <default-profile><![CDATA[false]]></default-profile> - <provided><![CDATA[false]]></provided> - <language><![CDATA[test language]]></language> - <parentName><![CDATA[test name]]></parentName> - <active-rules> - <active-rule> - <key><![CDATA[test key]]></key> - <plugin><![CDATA[test plugin]]></plugin> - <level><![CDATA[ERROR]]></level> - <inheritance><![CDATA[OVERRIDES]]></inheritance> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test value]]></value> - </param> - </params> - </active-rule> - </active-rules> - <alerts/> - </profile> - </profiles> - <rules> - <rule> - <parentRepositoryKey><![CDATA[test plugin]]></parentRepositoryKey> - <parentKey><![CDATA[test key]]></parentKey> - <repositoryKey><![CDATA[test plugin]]></repositoryKey> - <key><![CDATA[test key2]]></key> - <configKey><![CDATA[test config key]]></configKey> - <level><![CDATA[INFO]]></level> - <name><![CDATA[test name]]></name> - <description><![CDATA[test description]]></description> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test param value]]></value> - </param> - </params> - </rule> - </rules> -</sonar-config> diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml deleted file mode 100644 index 77498b9ece7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml +++ /dev/null @@ -1,25 +0,0 @@ -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <profiles> - <profile> - <name><![CDATA[test name]]></name> - <default-profile><![CDATA[true]]></default-profile> - <provided><![CDATA[true]]></provided> - <language><![CDATA[test language]]></language> - <active-rules> - <active-rule> - <key><![CDATA[test key]]></key> - <plugin><![CDATA[test plugin]]></plugin> - <level><![CDATA[ERROR]]></level> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test value]]></value> - </param> - </params> - </active-rule> - </active-rules> - </profile> - </profiles> -</sonar-config> 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 deleted file mode 100644 index db8bbdf9a92..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml +++ /dev/null @@ -1,112 +0,0 @@ -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <metrics> - <metric> - <key><![CDATA[metric1]]></key> - <description><![CDATA[metric1]]></description> - <type><![CDATA[INT]]></type> - <direction><![CDATA[-1]]></direction> - <name><![CDATA[metric1]]></name> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[GUI]]></origin> - <hidden><![CDATA[false]]></hidden> - </metric> - <metric> - <key><![CDATA[metric2]]></key> - <description><![CDATA[metric2]]></description> - <type><![CDATA[INT]]></type> - <direction><![CDATA[-1]]></direction> - <name><![CDATA[metric2]]></name> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[WS]]></origin> - <hidden><![CDATA[false]]></hidden> - </metric> - </metrics> - <properties> - <property> - <key><![CDATA[key1]]></key> - <value><![CDATA[value1]]></value> - </property> - <property> - <key><![CDATA[key2]]></key> - <value><![CDATA[value2]]></value> - </property> - </properties> - <profiles> - <profile> - <name><![CDATA[test name]]></name> - <version><![CDATA[1]]></version> - <used><![CDATA[false]]></used> - <language><![CDATA[test language]]></language> - <active-rules> - <active-rule> - <key><![CDATA[test key]]></key> - <plugin><![CDATA[test plugin]]></plugin> - <level><![CDATA[MAJOR]]></level> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test value]]></value> - </param> - </params> - </active-rule> - </active-rules> - <alerts> - <alert> - <operator><![CDATA[>]]></operator> - <value-error><![CDATA[testError]]></value-error> - <value-warning><![CDATA[testWarn]]></value-warning> - <metric-key><![CDATA[test key]]></metric-key> - </alert> - <alert> - <operator><![CDATA[<]]></operator> - <value-error><![CDATA[testError2]]></value-error> - <value-warning><![CDATA[testWarn2]]></value-warning> - <period><![CDATA[1]]></period> - <metric-key><![CDATA[test key2]]></metric-key> - </alert> - </alerts> - </profile> - <profile> - <name><![CDATA[test2 name]]></name> - <version><![CDATA[1]]></version> - <language><![CDATA[test language]]></language> - <used><![CDATA[false]]></used> - <parentName><![CDATA[test name]]></parentName> - <active-rules> - <active-rule> - <key><![CDATA[test key]]></key> - <plugin><![CDATA[test plugin]]></plugin> - <level><![CDATA[MINOR]]></level> - <inheritance><![CDATA[OVERRIDES]]></inheritance> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test value]]></value> - </param> - </params> - </active-rule> - </active-rules> - <alerts/> - </profile> - </profiles> - <rules> - <rule> - <parentRepositoryKey><![CDATA[test plugin]]></parentRepositoryKey> - <parentKey><![CDATA[test key]]></parentKey> - <repositoryKey><![CDATA[test plugin]]></repositoryKey> - <key><![CDATA[test key2]]></key> - <configKey><![CDATA[test config key]]></configKey> - <level><![CDATA[INFO]]></level> - <name><![CDATA[test name]]></name> - <description><![CDATA[test description]]></description> - <params> - <param> - <key><![CDATA[test param key]]></key> - <value><![CDATA[test param value]]></value> - </param> - </params> - </rule> - </rules> -</sonar-config> diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml deleted file mode 100644 index f1e0214577e..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <properties> - <property> - <key><![CDATA[key]]></key> - <value><![CDATA[<value>]]></value> - </property> - </properties> -</sonar-config> - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml deleted file mode 100644 index 7d201084514..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[92]]></version> - <date><![CDATA[2010-09-27]]></date> - <metrics> - <metric> - <id><![CDATA[68]]></id> - <key><![CDATA[team_velocity]]></key> - <description><![CDATA[The team's velocity during one sprint. Measured at sprint ending (completed SP).]]></description> - <type><![CDATA[INT]]></type> - <direction><![CDATA[0]]></direction> - <domain><![CDATA[Management]]></domain> - <name><![CDATA[Team Velocity]]></name> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[GUI]]></origin> - </metric> - </metrics> -</sonar-config> diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml deleted file mode 100644 index cc6031719bc..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <properties> - <property> - <key><![CDATA[key1]]></key> - <value><![CDATA[<![CDATA[value1]]]]><![CDATA[>]]></value> - </property> - <property> - <key><![CDATA[key2]]></key> - <value><![CDATA[]]]]><![CDATA[>value2]]></value> - </property> - <property> - <key><![CDATA[key3]]></key> - <value><![CDATA[prefix]]]]><![CDATA[>value3]]></value> - </property> - <property> - <key><![CDATA[key4]]></key> - <value><![CDATA[<name><![CDATA[Forges]]]]><![CDATA[></name>]]></value> - </property> - </properties> -</sonar-config> diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml deleted file mode 100644 index 4673604a3a6..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[54]]></version> - <date><![CDATA[2008-11-18]]></date> - <properties> - <property> - <key><![CDATA[key]]></key> - <value><![CDATA[é]]></value> - </property> - </properties> -</sonar-config> - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml deleted file mode 100644 index e8abf3bfa98..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[53]]></version> - <date><![CDATA[2009-01-27]]></date> - <metrics> - <metric> - <key><![CDATA[fake_metric]]></key> - <description><![CDATA[My's fake]]></description> - <type><![CDATA[BOOL]]></type> - <direction><![CDATA[0]]></direction> - <domain><![CDATA[Fake]]></domain> - <name><![CDATA[Fake metric]]></name> - <comparable><![CDATA[true]]></comparable> - <qualitative><![CDATA[false]]></qualitative> - <origin><![CDATA[GUI]]></origin> - </metric> - </metrics> - <properties> - <property> - <key><![CDATA[tendency.depth]]></key> - <value><![CDATA[3]]></value> - </property> - <property> - <key><![CDATA[sonar.findbugs.effort]]></key> - <value><![CDATA[Min]]></value> - </property> - </properties> -</sonar-config>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties b/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties deleted file mode 100644 index 9e7bb9aeedc..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties +++ /dev/null @@ -1 +0,0 @@ -this: is a test
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties b/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties deleted file mode 100644 index 99ff1a9b455..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties +++ /dev/null @@ -1,2 +0,0 @@ -my.param.one: foo -my.param.two: ${env:PATH}
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml deleted file mode 100644 index 3d577e3f4ab..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sonar-config> - <version><![CDATA[180]]></version> - <date><![CDATA[2011-02-08]]></date> - <metrics/> - <properties> - <property> - <key><![CDATA[sonar.multiline.secured]]></key> - <value><![CDATA[ONQwdcwcwwdadalkdmaiQGMqMVnhtAbhxwjjoVkHbWgx - mi2KrURzVJmEZQD1l0T>JBJk2Ke7ZrTZvmO00u366sv9IY - rqqMuWRPpRNNRompPqrtwqnoPpMoqqprMrVVvVXXVtVppQ - RrnmqmUUnorrvrtommmmmUCasdaswommmmmUUJlkXoUUn - mmmm]]></value> - </property> - </properties> - <profiles> - </profiles> - <rules/> -</sonar-config>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml deleted file mode 100644 index 14eeece367b..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml +++ /dev/null @@ -1,3 +0,0 @@ -<dataset> - <properties id="1" prop_key="key1" text_value="value1,value2,value3" resource_id="[null]" user_id="[null]"/> -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml deleted file mode 100644 index 0465db20f30..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml +++ /dev/null @@ -1,10 +0,0 @@ -<dataset> - <properties id="1" prop_key="key1" text_value="value1" resource_id="[null]" user_id="[null]"/> - <properties id="2" prop_key="key2" text_value="value2" resource_id="[null]" user_id="[null]"/> - - <!-- Sonar Core property that should not be exported --> - <properties id="3" prop_key="sonar.core.id" text_value="123456" resource_id="[null]" user_id="[null]"/> - - <!-- Sonar Core property that should be exported --> - <properties id="4" prop_key="sonar.core.version" text_value="3.1" resource_id="[null]" user_id="[null]"/> -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml deleted file mode 100644 index 7c6403b5e4a..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - <!-- global properties --> - <properties id="1" prop_key="key1" text_value="oldvalue" resource_id="[null]" user_id="[null]"/> - - -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml deleted file mode 100644 index ef2bf774438..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml +++ /dev/null @@ -1,27 +0,0 @@ -<dataset> - - <!-- global properties are removed --> - <!--<properties id="1" prop_key="key1" text_value="oldvalue" resource_id="[null]" user_id="[null]"/>--> - - <!-- project properties are not removed --> - <properties id="2" prop_key="old1" text_value="value1" resource_id="3" user_id="[null]"/> - <properties id="3" prop_key="old2" text_value="value2" resource_id="3" user_id="[null]"/> - - <!-- user properties are not removed --> - <properties id="4" prop_key="user_prop" text_value="[null]" resource_id="[null]" user_id="3"/> - <properties id="5" prop_key="favorite" text_value="[null]" resource_id="8" user_id="3"/> - - <!-- Sonar Core property that was not purged --> - <properties id="6" prop_key="sonar.core.id" text_value="123456" resource_id="[null]" user_id="[null]"/> - - <!-- Sonar Core properties that were not purged --> - <!-- - <properties id="7" prop_key="sonar.core.version" text_value="3.1" resource_id="[null]" user_id="[null]"/> - <properties id="8" prop_key="sonar.core.startTime" text_value="2012-04-19T11:01:45+0200" resource_id="[null]" user_id="[null]"/> - --> - - <!-- New properties that were imported --> - <properties id="9" prop_key="key1" text_value="value1" resource_id="[null]" user_id="[null]"/> - <properties id="10" prop_key="key2" text_value="value2" resource_id="[null]" user_id="[null]"/> - <properties id="11" prop_key="key3" text_value="value3" resource_id="[null]" user_id="[null]"/> -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml deleted file mode 100644 index 70baf106f3c..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml +++ /dev/null @@ -1,20 +0,0 @@ -<dataset> - <!-- global properties --> - <properties id="1" prop_key="key1" text_value="oldvalue" resource_id="[null]" user_id="[null]"/> - - <!-- project properties --> - <properties id="2" prop_key="old1" text_value="value1" resource_id="3" user_id="[null]"/> - <properties id="3" prop_key="old2" text_value="value2" resource_id="3" user_id="[null]"/> - - <!-- user properties --> - <properties id="4" prop_key="user_prop" text_value="[null]" resource_id="[null]" user_id="3"/> - <properties id="5" prop_key="favorite" text_value="[null]" resource_id="8" user_id="3"/> - - <!-- Sonar Core property that must not be purged --> - <properties id="6" prop_key="sonar.core.id" text_value="123456" resource_id="[null]" user_id="[null]"/> - - <!-- Sonar Core properties that can be purged --> - <properties id="7" prop_key="sonar.core.version" text_value="3.1" resource_id="[null]" user_id="[null]"/> - <properties id="8" prop_key="sonar.core.startTime" text_value="2012-04-19T11:01:45+0200" resource_id="[null]" user_id="[null]"/> - -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml deleted file mode 100644 index f5bb4b2d1f7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - <properties id="1" prop_key="key1" text_value="value1" resource_id="[null]" user_id="[null]"/> - <properties id="2" prop_key="key2" text_value="value2" resource_id="[null]" user_id="[null]"/> - <properties id="3" prop_key="key2" text_value="value for resource 2" resource_id="2" user_id="[null]"/> - <properties id="4" prop_key="key3" text_value="value for resource 3" resource_id="3" user_id="[null]"/> -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml deleted file mode 100644 index 6960761aeea..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml +++ /dev/null @@ -1,8 +0,0 @@ -<dataset> - <!-- Only global property left, unchanged --> - <properties id="1" prop_key="sonar.core.id" text_value="123456" resource_id="[null]" user_id="[null]"/> - - <!-- project properties --> - <properties id="5" prop_key="old2" text_value="value2" resource_id="3" user_id="[null]"/> - -</dataset>
\ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml deleted file mode 100644 index 67a28cb033e..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml +++ /dev/null @@ -1,11 +0,0 @@ -<dataset> - <!-- global properties --> - <properties id="1" prop_key="sonar.core.id" text_value="123456" resource_id="[null]" user_id="[null]"/> - <properties id="2" prop_key="sonar.core.version" text_value="3.1" resource_id="[null]" user_id="[null]"/> - <properties id="3" prop_key="sonar.core.startTime" text_value="2012-04-19T11:01:45+0200" resource_id="[null]" user_id="[null]"/> - <properties id="4" prop_key="key1" text_value="oldvalue" resource_id="[null]" user_id="[null]"/> - - <!-- project properties --> - <properties id="5" prop_key="old2" text_value="value2" resource_id="3" user_id="[null]"/> - -</dataset>
\ No newline at end of file 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/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml index 6990ee887cf..6990ee887cf 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml index cf8d9f25a59..cf8d9f25a59 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml 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/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml index 50c7913ddce..50c7913ddce 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml index 226d04aa39f..226d04aa39f 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldCheckCycles.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml index 2a34f38f480..2a34f38f480 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldCheckCycles.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml 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/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml index 97b54867590..97b54867590 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml index 90ca7db8e7b..90ca7db8e7b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml index 3f3236668d6..3f3236668d6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml index 7fdf1b787b6..7fdf1b787b6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml 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/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml index 11c9b33673b..11c9b33673b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml index da1f234bdf4..da1f234bdf4 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml 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/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml index af743bcc7a9..af743bcc7a9 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml index 15bb039df75..15bb039df75 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportEnabledField.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportEnabledField.xml index cbd461b32e2..cbd461b32e2 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportEnabledField.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportEnabledField.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportMissingEnabledField.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportMissingEnabledField.xml index 4ba3d1f7053..4ba3d1f7053 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportMissingEnabledField.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportMissingEnabledField.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile-result.xml index e31d8978f02..e31d8978f02 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml index d1a4eea9b8b..d1a4eea9b8b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/initialData.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml index 6b30e58185b..6b30e58185b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/initialData.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/removeActivatedRules-result.xml index 3f4e28b174d..3f4e28b174d 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/removeActivatedRules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleActivated-result.xml index e19b67be4cf..e19b67be4cf 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleActivated-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleDeactivated-result.xml index 28129b3017d..28129b3017d 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleDeactivated-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleParamChanged-result.xml index 698999f5239..698999f5239 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleParamChanged-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted-result.xml index eda98ec8c82..eda98ec8c82 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml index 5ef9bf1a269..5ef9bf1a269 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleSeverityChanged-result.xml index 69d8e4077aa..69d8e4077aa 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleSeverityChanged-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml index 3aa3efa4fb3..3aa3efa4fb3 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsed-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsed-result.xml index 01bf3158146..01bf3158146 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsed-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsed-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml index 25f6aac5a80..25f6aac5a80 100644 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml |