revert renaming of org.sonar.core.technicaldebt to org.sonar.core.debt as sonar-core module is used by Views Plugin

sonar-batch/src/main/java/org/sonar/batch/debt/DebtModelLoader.java

@@ -27,9 +27,9 @@ import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RuleQuery;
 import org.sonar.api.technicaldebt.batch.TechnicalDebtModel;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
-import org.sonar.core.debt.DefaultTechnicalDebtModel;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.util.Collection;
 import java.util.List;

sonar-batch/src/test/java/org/sonar/batch/debt/DebtModelLoaderTest.java

@@ -32,9 +32,9 @@ import org.sonar.api.rules.RuleQuery;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.DefaultTechnicalDebtModel;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.fest.assertions.Assertions.assertThat;

sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java

@@ -22,7 +22,6 @@ package org.sonar.core.persistence;
 import com.google.common.collect.ImmutableList;
 import org.sonar.core.dashboard.ActiveDashboardDao;
 import org.sonar.core.dashboard.DashboardDao;
-import org.sonar.core.debt.db.CharacteristicDao;
 import org.sonar.core.duplication.DuplicationDao;
 import org.sonar.core.graph.jdbc.GraphDao;
 import org.sonar.core.issue.db.*;
@@ -42,6 +41,7 @@ import org.sonar.core.rule.RuleDao;
 import org.sonar.core.rule.RuleTagDao;
 import org.sonar.core.source.db.SnapshotDataDao;
 import org.sonar.core.source.db.SnapshotSourceDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
 import org.sonar.core.template.LoadedTemplateDao;
 import org.sonar.core.user.*;
 

sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java

@@ -36,8 +36,6 @@ import org.sonar.core.component.ComponentDto;
 import org.sonar.core.component.db.ComponentMapper;
 import org.sonar.core.config.Logback;
 import org.sonar.core.dashboard.*;
-import org.sonar.core.debt.db.CharacteristicDto;
-import org.sonar.core.debt.db.CharacteristicMapper;
 import org.sonar.core.dependency.DependencyDto;
 import org.sonar.core.dependency.DependencyMapper;
 import org.sonar.core.dependency.ResourceSnapshotDto;
@@ -65,6 +63,8 @@ import org.sonar.core.rule.*;
 import org.sonar.core.source.db.SnapshotDataDto;
 import org.sonar.core.source.db.SnapshotDataMapper;
 import org.sonar.core.source.db.SnapshotSourceMapper;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicMapper;
 import org.sonar.core.template.LoadedTemplateDto;
 import org.sonar.core.template.LoadedTemplateMapper;
 import org.sonar.core.user.*;

sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.ibatis.session.SqlSession;
@@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.ServerExtension;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.List;

sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.stax2.XMLInputFactory2;

sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;

sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 
 import org.sonar.api.rule.RuleKey;
@@ -27,8 +27,8 @@ import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.technicaldebt.server.Characteristic;
 import org.sonar.api.technicaldebt.server.TechnicalDebtManager;
 import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;

sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;

sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -31,9 +31,9 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 

sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.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.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Maps;
 import org.sonar.api.rule.RuleKey;

sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
@@ -38,7 +38,7 @@ import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 import javax.xml.stream.XMLInputFactory;

sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;

sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;

sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import java.util.List;
 

sonar-core/src/main/java/org/sonar/core/debt/package-info.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java

@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
 @ParametersAreNonnullByDefault
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt.db;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java → sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java

@@ -17,8 +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.
  */
-
 @ParametersAreNonnullByDefault
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml → sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml

@@ -2,7 +2,7 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd">
 
-<mapper namespace="org.sonar.core.debt.db.CharacteristicMapper">
+<mapper namespace="org.sonar.core.technicaldebt.db.CharacteristicMapper">
 
   <sql id="characteristicColumns">
     c.id,

sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
@@ -32,9 +32,9 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.Collections;

sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;

sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 
 public class DebtModelPluginRepositoryTest {
 
-  private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/debt/TechnicalDebtModelRepositoryTest/";
+  private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/";
 
   private DebtModelPluginRepository modelFinder;
 

sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,8 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.technicaldebt.server.Characteristic;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.util.List;
 

sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.junit.Before;
 import org.junit.Test;

sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;

sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
@@ -36,9 +36,9 @@ import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.Collections;

sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.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.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.fest.assertions.Assertions;

sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;

sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.junit.Before;
 import org.junit.Test;

sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java → sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;

sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java

@@ -38,8 +38,8 @@ import org.sonar.api.utils.Durations;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.component.ComponentDto;
-import org.sonar.core.debt.DefaultTechnicalDebtManager;
 import org.sonar.core.issue.workflow.Transition;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager;
 import org.sonar.markdown.Markdown;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.issue.ActionService;

sonar-server/src/main/java/org/sonar/server/platform/Platform.java

@@ -40,7 +40,6 @@ import org.sonar.api.utils.internal.TempFolderCleaner;
 import org.sonar.core.component.SnapshotPerspectives;
 import org.sonar.core.component.db.ComponentDao;
 import org.sonar.core.config.Logback;
-import org.sonar.core.debt.*;
 import org.sonar.core.i18n.DefaultI18n;
 import org.sonar.core.i18n.GwtI18n;
 import org.sonar.core.i18n.RuleI18nManager;
@@ -64,6 +63,7 @@ import org.sonar.core.qualitygate.db.QualityGateConditionDao;
 import org.sonar.core.qualitygate.db.QualityGateDao;
 import org.sonar.core.resource.DefaultResourcePermissions;
 import org.sonar.core.rule.DefaultRuleFinder;
+import org.sonar.core.technicaldebt.*;
 import org.sonar.core.test.TestPlanPerspectiveLoader;
 import org.sonar.core.test.TestablePerspectiveLoader;
 import org.sonar.core.timemachine.Periods;

sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java

@@ -30,9 +30,9 @@ import org.sonar.api.rules.RuleRepository;
 import org.sonar.api.server.rule.RuleDefinitions;
 import org.sonar.api.server.rule.RuleParamType;
 import org.sonar.check.Cardinality;
-import org.sonar.core.debt.DebtModelPluginRepository;
-import org.sonar.core.debt.RulesDebtModelXMLImporter;
 import org.sonar.core.i18n.RuleI18nManager;
+import org.sonar.core.technicaldebt.DebtModelPluginRepository;
+import org.sonar.core.technicaldebt.RulesDebtModelXMLImporter;
 
 import javax.annotation.CheckForNull;
 

sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java

@@ -36,11 +36,11 @@ import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.check.Cardinality;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.qualityprofile.db.ActiveRuleDao;
 import org.sonar.core.rule.*;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 import org.sonar.server.qualityprofile.ProfilesManager;
 import org.sonar.server.startup.RegisterDebtCharacteristicModel;
 

sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtCharacteristicModel.java

@@ -24,7 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.CharacteristicsDebtModelSynchronizer;
+import org.sonar.core.technicaldebt.CharacteristicsDebtModelSynchronizer;
 
 public class RegisterDebtCharacteristicModel {
 

sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java

@@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.TechnicalDebtModelSynchronizer;
-import org.sonar.core.debt.TechnicalDebtRuleCache;
+import org.sonar.core.technicaldebt.TechnicalDebtModelSynchronizer;
+import org.sonar.core.technicaldebt.TechnicalDebtRuleCache;
 import org.sonar.server.rule.RuleRegistration;
 
 public final class RegisterTechnicalDebtModel {

sonar-server/src/main/java/org/sonar/server/technicaldebt/DebtService.java

@@ -22,7 +22,7 @@ package org.sonar.server.technicaldebt;
 
 import org.sonar.api.ServerComponent;
 import org.sonar.api.technicaldebt.server.Characteristic;
-import org.sonar.core.debt.DefaultTechnicalDebtManager;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager;
 
 import javax.annotation.CheckForNull;
 

sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java

@@ -46,10 +46,10 @@ import org.sonar.api.utils.Duration;
 import org.sonar.api.utils.Durations;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.component.ComponentDto;
-import org.sonar.core.debt.DefaultTechnicalDebtManager;
 import org.sonar.core.issue.DefaultActionPlan;
 import org.sonar.core.issue.DefaultIssueQueryResult;
 import org.sonar.core.issue.workflow.Transition;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager;
 import org.sonar.core.user.DefaultUser;
 import org.sonar.server.issue.ActionService;
 import org.sonar.server.issue.IssueChangelog;

sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java

@@ -31,9 +31,9 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.RuleRepository;
 import org.sonar.api.server.rule.RuleDefinitions;
-import org.sonar.core.debt.DebtModelPluginRepository;
-import org.sonar.core.debt.RulesDebtModelXMLImporter;
 import org.sonar.core.i18n.RuleI18nManager;
+import org.sonar.core.technicaldebt.DebtModelPluginRepository;
+import org.sonar.core.technicaldebt.RulesDebtModelXMLImporter;
 
 import java.io.Reader;
 import java.util.Arrays;

sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java

@@ -27,12 +27,12 @@ import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.server.rule.RuleDefinitions;
 import org.sonar.api.utils.MessageException;
-import org.sonar.core.debt.db.CharacteristicDao;
 import org.sonar.core.persistence.AbstractDaoTestCase;
 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.core.technicaldebt.db.CharacteristicDao;
 import org.sonar.server.qualityprofile.ProfilesManager;
 import org.sonar.server.startup.RegisterDebtCharacteristicModel;
 

sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtCharacteristicModelTest.java

@@ -22,7 +22,7 @@ package org.sonar.server.startup;
 
 import org.junit.Test;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.CharacteristicsDebtModelSynchronizer;
+import org.sonar.core.technicaldebt.CharacteristicsDebtModelSynchronizer;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;

sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java

@@ -22,8 +22,8 @@ package org.sonar.server.startup;
 import org.junit.Test;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.TechnicalDebtModelSynchronizer;
-import org.sonar.core.debt.TechnicalDebtRuleCache;
+import org.sonar.core.technicaldebt.TechnicalDebtModelSynchronizer;
+import org.sonar.core.technicaldebt.TechnicalDebtRuleCache;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;

sonar-server/src/test/java/org/sonar/server/technicaldebt/DebtServiceTest.java

@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.technicaldebt.server.Characteristic;
 import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic;
-import org.sonar.core.debt.DefaultTechnicalDebtManager;
+import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager;
 
 import java.util.List;