SONAR-4301 Rename issues.resource_id by issues.component_id and issues.project_id by issues.root_component_id

46 files changed, 242 insertions, 241 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
index d6179b68b82..0d1390fd5cd 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
@@ -39,8 +39,8 @@ public final class IssueDto {
 
   private Long id;
   private String kee;
-  private Integer resourceId;
-  private Integer projectId;
+  private Integer componentId;
+  private Integer rootComponentId;
   private Integer ruleId;
   private String severity;
   private boolean manualSeverity;
@@ -69,7 +69,7 @@ public final class IssueDto {
   private transient String ruleKey;
   private transient String ruleRepo;
   private transient String componentKey;
-  private transient String projectKey;
+  private transient String rootComponentKey;
 
   public Long getId() {
     return id;
@@ -89,21 +89,21 @@ public final class IssueDto {
     return this;
   }
 
-  public Integer getResourceId() {
-    return resourceId;
+  public Integer getComponentId() {
+    return componentId;
   }
 
-  public IssueDto setResourceId(Integer resourceId) {
-    this.resourceId = resourceId;
+  public IssueDto setComponentId(Integer componentId) {
+    this.componentId = componentId;
     return this;
   }
 
-  public Integer getProjectId() {
-    return projectId;
+  public Integer getRootComponentId() {
+    return rootComponentId;
   }
 
-  public IssueDto setProjectId(Integer projectId) {
-    this.projectId = projectId;
+  public IssueDto setRootComponentId(Integer rootComponentId) {
+    this.rootComponentId = rootComponentId;
     return this;
   }
 
@@ -300,8 +300,8 @@ public final class IssueDto {
     return componentKey;
   }
 
-  public String getProjectKey() {
-    return projectKey;
+  public String getRootComponentKey() {
+    return rootComponentKey;
   }
 
   /**
@@ -324,8 +324,8 @@ public final class IssueDto {
   /**
    * Only for unit tests
    */
-  public IssueDto setProjectKey_unit_test_only(String projectKey) {
-    this.projectKey = projectKey;
+  public IssueDto setRootComponentKey_unit_test_only(String rootComponentKey) {
+    this.rootComponentKey = rootComponentKey;
     return this;
   }
 
@@ -334,7 +334,7 @@ public final class IssueDto {
     return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
   }
 
-  public static IssueDto toDtoForInsert(DefaultIssue issue, Integer componentId, Integer projectId, Integer ruleId, Date now) {
+  public static IssueDto toDtoForInsert(DefaultIssue issue, Integer componentId, Integer rootComponentId, Integer ruleId, Date now) {
     return new IssueDto()
       .setKee(issue.key())
       .setLine(issue.line())
@@ -348,8 +348,8 @@ public final class IssueDto {
       .setReporter(issue.reporter())
       .setAssignee(issue.assignee())
       .setRuleId(ruleId)
-      .setResourceId(componentId)
-      .setProjectId(projectId)
+      .setComponentId(componentId)
+      .setRootComponentId(rootComponentId)
       .setActionPlanKey(issue.actionPlanKey())
       .setIssueAttributes(issue.attributes() != null ? KeyValueFormat.format(issue.attributes()) : "")
       .setAuthorLogin(issue.authorLogin())
@@ -397,7 +397,7 @@ public final class IssueDto {
     issue.setAssignee(assignee);
     issue.setAttributes(KeyValueFormat.parse(Objects.firstNonNull(issueAttributes, "")));
     issue.setComponentKey(componentKey);
-    issue.setProjectKey(projectKey);
+    issue.setProjectKey(rootComponentKey);
     issue.setManualSeverity(manualSeverity);
     issue.setRuleKey(RuleKey.of(ruleRepo, ruleKey));
     issue.setActionPlanKey(actionPlanKey);
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java b/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java
index 23bd385d1b8..196da80d360 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java
@@ -28,6 +28,7 @@ import org.sonar.api.utils.SonarException;
 
 import javax.annotation.Nullable;
 import javax.sql.DataSource;
+
 import java.io.File;
 import java.io.IOException;
 import java.sql.SQLException;
@@ -80,7 +81,7 @@ public class DryRunDatabaseFactory implements ServerComponent {
       String snapshotCondition = "islast=" + database.getDialect().getTrueSqlValue() + " and (project_id=" + projectId + " or root_project_id=" + projectId + ")";
       template
         .copyTable(source, dest, "projects", "(id=" + projectId + " or root_id=" + projectId + ")")
-        .copyTable(source, dest, "issues", "resource_id in (" + projectsConditionForIssues + ")", "status<>'" + Issue.STATUS_CLOSED + "'")
+        .copyTable(source, dest, "issues", "component_id in (" + projectsConditionForIssues + ")", "status<>'" + Issue.STATUS_CLOSED + "'")
         .copyTable(source, dest, "snapshots", snapshotCondition);
     }
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
index 368462b040d..542b29a7cf7 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
@@ -126,8 +126,8 @@ public class MyBatis implements BatchComponent, ServerComponent {
       SemaphoreMapper.class, UserMapper.class, WidgetMapper.class, WidgetPropertyMapper.class, MeasureMapper.class, SnapshotDataMapper.class,
       SnapshotSourceMapper.class, ActionPlanMapper.class, ActionPlanStatsMapper.class
     };
-    loadMappers(conf, mappers);
     loadMapper(conf, "org.sonar.core.user.AuthorizationMapper");
+    loadMappers(conf, mappers);
     configureLogback(mappers);
 
     sessionFactory = new SqlSessionFactoryBuilder().build(conf);
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 318d4184650..198c1fce85f 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -7,8 +7,8 @@
   <sql id="issueColumns">
     i.id,
     i.kee as kee,
-    i.resource_id as resourceId,
-    i.project_id as projectId,
+    i.component_id as componentId,
+    i.root_component_id as rootComponentId,
     i.rule_id as ruleId,
     i.action_plan_key as actionPlanKey,
     i.severity as severity,
@@ -31,7 +31,7 @@
     r.plugin_rule_key as ruleKey,
     r.plugin_name as ruleRepo,
     p.kee as componentKey,
-    root.kee as projectKey
+    root.kee as rootComponentKey
   </sql>
 
   <sql id="sortColumn">
@@ -60,11 +60,11 @@
   </sql>
 
   <insert id="insert" parameterType="Issue" useGeneratedKeys="false" keyProperty="id">
-    INSERT INTO issues (kee, resource_id, project_id, rule_id, action_plan_key, severity, manual_severity,
+    INSERT INTO issues (kee, component_id, root_component_id, rule_id, action_plan_key, severity, manual_severity,
     message, line, effort_to_fix, status,
     resolution, checksum, reporter, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at)
-    VALUES (#{kee}, #{resourceId}, #{projectId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity},
+    VALUES (#{kee}, #{componentId}, #{rootComponentId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity},
     #{message}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{issueAttributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
@@ -76,11 +76,11 @@
     <selectKey order="BEFORE" resultType="Long" keyProperty="id">
       select issues_seq.NEXTVAL from DUAL
     </selectKey>
-    INSERT INTO issues (id, kee, resource_id, project_id, rule_id, action_plan_key, severity, manual_severity,
+    INSERT INTO issues (id, kee, component_id, root_component_id, rule_id, action_plan_key, severity, manual_severity,
     message, line, effort_to_fix, status,
     resolution, checksum, reporter, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at)
-    VALUES (#{id}, #{kee}, #{resourceId}, #{projectId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity},
+    VALUES (#{id}, #{kee}, #{componentId}, #{rootComponentId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity},
     #{message}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{issueAttributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
@@ -115,7 +115,7 @@
     select
     <include refid="issueColumns"/>
     from issues i, rules r, projects p, projects root
-    where i.kee=#{kee} and i.rule_id=r.id and p.id=i.resource_id and i.project_id=root.id
+    where i.kee=#{kee} and i.rule_id=r.id and p.id=i.component_id and i.root_component_id=root.id
   </select>
 
   <select id="selectNonClosedIssues" parameterType="int" resultType="Issue">
@@ -124,8 +124,8 @@
     from issues i, rules r, projects p, projects root
     where i.status &lt;&gt; 'CLOSED'
     and (p.root_id=#{id} or (p.root_id is null and p.id=#{id}))
-    and i.resource_id=p.id
-    and i.project_id=root.id
+    and i.component_id=p.id
+    and i.root_component_id=root.id
     and r.id=i.rule_id
   </select>
 
@@ -141,8 +141,8 @@
         </foreach>
       </foreach>
       and i.rule_id=r.id
-      and p.id=i.resource_id
-      and i.project_id=root.id
+      and p.id=i.component_id
+      and i.root_component_id=root.id
     </where>
   </select>
 
@@ -164,14 +164,14 @@
 
   <sql id="selectQueryConditions">
     from issues i
-    inner join (<include refid="org.sonar.core.user.AuthorizationMapper.selectAuthorizedRootProjectsIdsQuery" />) authorizedProjects on authorizedProjects.root_project_id=i.project_id
+    inner join (<include refid="org.sonar.core.user.AuthorizationMapper.selectAuthorizedRootProjectsIdsQuery" />) authorizedProjects on authorizedProjects.root_project_id=i.root_component_id
     <if test="query.componentRoots() != null and query.componentRoots().size() > 0">
       inner join projects rootprojects on rootprojects.enabled=${_true} and rootprojects.kee in
       <foreach item="componentRoot" index="index" collection="query.componentRoots()" open="(" separator="," close=")">
         #{componentRoot}
       </foreach>
       inner join snapshots rootsnapshots on rootsnapshots.project_id=rootprojects.id and rootsnapshots.islast=${_true}
-      inner join snapshots s on s.project_id=i.resource_id and s.islast=${_true} and
+      inner join snapshots s on s.project_id=i.component_id and s.islast=${_true} and
       (s.id=rootsnapshots.id or ((s.root_snapshot_id=rootsnapshots.id or s.root_snapshot_id=rootsnapshots.root_snapshot_id) and
       <choose>
         <when test="_databaseId == 'mssql'">
@@ -187,7 +187,7 @@
       ))
     </if>
     <if test="query.components() != null and query.components().size() > 0">
-      inner join projects project_component on project_component.id=i.resource_id and project_component.enabled=${_true} and project_component.kee in
+      inner join projects project_component on project_component.id=i.component_id and project_component.enabled=${_true} and project_component.kee in
       <foreach item="component" index="index" collection="query.components()" open="(" separator="," close=")">#{component}
       </foreach>
     </if>
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 80ca6029cfd..a52f49cb314 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -470,8 +470,8 @@ CREATE TABLE "GRAPHS" (
 CREATE TABLE "ISSUES" (
   "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "KEE" VARCHAR(50) UNIQUE NOT NULL,
-  "RESOURCE_ID" INTEGER NOT NULL,
-  "PROJECT_ID" INTEGER,
+  "COMPONENT_ID" INTEGER NOT NULL,
+  "ROOT_COMPONENT_ID" INTEGER,
   "RULE_ID" INTEGER,
   "SEVERITY" VARCHAR(10),
   "MANUAL_SEVERITY" BOOLEAN NOT NULL,
@@ -616,7 +616,7 @@ CREATE UNIQUE INDEX "GRAPHS_PERSPECTIVES" ON "GRAPHS" ("SNAPSHOT_ID", "PERSPECTI
 
 CREATE UNIQUE INDEX "ISSUES_KEE" ON "ISSUES" ("KEE");
 
-CREATE INDEX "ISSUES_RESOURCE_ID" ON "ISSUES" ("RESOURCE_ID");
+CREATE INDEX "ISSUES_COMPONENT_ID" ON "ISSUES" ("COMPONENT_ID");
 
 CREATE INDEX "ISSUES_RULE_ID" ON "ISSUES" ("RULE_ID");
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
index 1a38dae3827..936acac2cdf 100644
--- a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
@@ -196,23 +196,23 @@
 
   <delete id="deleteResourceIssueChanges" parameterType="long">
     delete from issue_changes ic
-    where exists (select * from issues i where i.kee=ic.issue_key and i.resource_id=#{id})
+    where exists (select * from issues i where i.kee=ic.issue_key and i.component_id=#{id})
   </delete>
 
   <!-- Mssql -->
   <delete id="deleteResourceIssueChanges" databaseId="mssql" parameterType="long">
     delete issue_changes from issue_changes
     inner join issues on issue_changes.issue_key=issues.kee
-    where issues.resource_id=#{id}
+    where issues.component_id=#{id}
   </delete>
 
   <!-- Mysql -->
   <delete id="deleteResourceIssueChanges" databaseId="mysql" parameterType="long">
-    delete ic from issue_changes as ic, issues as i where ic.issue_key=i.kee and i.resource_id=#{id}
+    delete ic from issue_changes as ic, issues as i where ic.issue_key=i.kee and i.component_id=#{id}
   </delete>
 
   <delete id="deleteResourceIssues" parameterType="long">
-    delete from issues where resource_id=#{id}
+    delete from issues where component_id=#{id}
   </delete>
 
 
@@ -220,7 +220,7 @@
     delete from issue_changes ic
     where exists (
     select * from issues i
-    where i.project_id=#{rootProjectId} and i.kee=ic.issue_key
+    where i.root_component_id=#{rootProjectId} and i.kee=ic.issue_key
     <choose>
       <when test="toDate == null">
         and i.issue_close_date is not null
@@ -236,7 +236,7 @@
   <delete id="deleteOldClosedIssueChanges" databaseId="mssql" parameterType="map">
     delete issue_changes from issue_changes
     inner join issues on issue_changes.issue_key=issues.kee
-    where issues.project_id=#{rootProjectId}
+    where issues.root_component_id=#{rootProjectId}
     <choose>
       <when test="toDate == null">
         and issues.issue_close_date is not null
@@ -251,7 +251,7 @@
   <delete id="deleteOldClosedIssueChanges" databaseId="mysql" parameterType="map">
     delete ic
     from issue_changes as ic, issues as i
-    where i.project_id=#{rootProjectId}
+    where i.root_component_id=#{rootProjectId}
     and ic.issue_key=i.kee
     <choose>
       <when test="toDate == null">
@@ -265,7 +265,7 @@
 
   <delete id="deleteOldClosedIssues" parameterType="map">
     delete from issues
-    where project_id=#{rootProjectId}
+    where root_component_id=#{rootProjectId}
     <choose>
       <when test="toDate == null">
         and issue_close_date is not null
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index b6a2b60cdc9..f66eb89b3ea 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -49,8 +49,8 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     IssueDto issue = dao.selectByKey("ABCDE");
     assertThat(issue.getKee()).isEqualTo("ABCDE");
     assertThat(issue.getId()).isEqualTo(100L);
-    assertThat(issue.getResourceId()).isEqualTo(401);
-    assertThat(issue.getProjectId()).isEqualTo(399);
+    assertThat(issue.getComponentId()).isEqualTo(401);
+    assertThat(issue.getRootComponentId()).isEqualTo(399);
     assertThat(issue.getRuleId()).isEqualTo(500);
     assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
     assertThat(issue.isManualSeverity()).isFalse();
@@ -72,7 +72,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getRuleRepo()).isEqualTo("squid");
     assertThat(issue.getRule()).isEqualTo("AvoidCycle");
     assertThat(issue.getComponentKey()).isEqualTo("Action.java");
-    assertThat(issue.getProjectKey()).isEqualTo("struts");
+    assertThat(issue.getRootComponentKey()).isEqualTo("struts");
   }
 
   @Test
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
index 339473eb050..d57d7024ecd 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
@@ -58,9 +58,9 @@ public class IssueDtoTest {
         .setRuleId(1)
         .setRuleKey_unit_test_only("squid", "AvoidCycle")
         .setComponentKey_unit_test_only("org.sonar.sample:Sample")
-        .setProjectKey_unit_test_only("org.sonar.sample")
-        .setResourceId(1)
-        .setProjectId(1)
+        .setRootComponentKey_unit_test_only("org.sonar.sample")
+        .setComponentId(1)
+        .setRootComponentId(1)
         .setStatus(Issue.STATUS_CLOSED)
         .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
         .setEffortToFix(15.0)
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
index f6844202bf3..b026bbadce6 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
@@ -39,8 +39,8 @@ public class IssueMapperTest extends AbstractDaoTestCase {
   @Test
   public void testInsert() throws Exception {
     IssueDto dto = new IssueDto();
-    dto.setResourceId(123);
-    dto.setProjectId(100);
+    dto.setComponentId(123);
+    dto.setRootComponentId(100);
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
@@ -73,8 +73,8 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     setupData("testUpdate");
 
     IssueDto dto = new IssueDto();
-    dto.setResourceId(123);
-    dto.setProjectId(100);
+    dto.setComponentId(123);
+    dto.setRootComponentId(100);
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
index 99469f9ac16..5ab673b9e26 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml
@@ -6,7 +6,7 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="400"
+      component_id="400"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -30,7 +30,7 @@
   <issues
       id="101"
       kee="ABCDF"
-      resource_id="400"
+      component_id="400"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -54,7 +54,7 @@
   <issues
       id="102"
       kee="ABCDG"
-      resource_id="400"
+      component_id="400"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
index dc88f9291bf..1d48a7733ef 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
index 6c3452b6e17..9f49d8cf418 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       action_plan_key="DEF"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
index 8663285f41c..0e2d4002e5d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component.xml
index ee35e68f6b1..3d343a04198 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="100"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="101"
-      resource_id="402"
-      project_id="399"
+      component_id="402"
+      root_component_id="399"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
index ee35e68f6b1..3d343a04198 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="100"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="101"
-      resource_id="402"
-      project_id="399"
+      component_id="402"
+      root_component_id="399"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
index ed7532a0666..cd509c70d50 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
index 33530589537..9d8a598b7ca 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
index 705a0cb90fc..9a5cc947917 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
index 58f34c08ccf..f42bdd65ab3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDF"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDG"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       action_plan_key="[null]"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
index cb897cd64ca..c03c58a6c3b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
index 2134f045362..0cf7fd0fe80 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -53,8 +53,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
index 24f222c2fa6..4a7b63611e9 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
index dc88f9291bf..1d48a7733ef 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_for_authorized_projects.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_for_authorized_projects.xml
index 0e6bf2a0ea8..0cca72c2f7c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_for_authorized_projects.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_for_authorized_projects.xml
@@ -15,8 +15,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -40,8 +40,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -67,8 +67,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="402"
-      project_id="400"
+      component_id="402"
+      root_component_id="400"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_return_limited_results.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_return_limited_results.xml
index b581467050c..0a8baed2c93 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_return_limited_results.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_return_limited_results.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_with_sort_column.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_with_sort_column.xml
index b581467050c..0a8baed2c93 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_with_sort_column.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issues_with_sort_column.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
index a7be9512891..e276f59a2b1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="100"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="101"
-      resource_id="402"
-      project_id="399"
+      component_id="402"
+      root_component_id="399"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -53,8 +53,8 @@
   <issues
       id="102"
       kee="102"
-      resource_id="402"
-      project_id="399"
+      component_id="402"
+      root_component_id="399"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
index ffebd21b94d..1348fdc28b5 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_assignee.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
index 34af2900385..4255d476eee 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_close_date.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
index 0662d409941..d2b3ec5d3fb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_creation_date.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -53,8 +53,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
index c86cba753bd..205bf11b843 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_severity.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="MINOR"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -53,8 +53,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
index 8c81f058bc2..30bb6f2762a 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_status.xml
@@ -4,8 +4,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,8 +29,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,8 +56,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
index 32dab2f3371..15bfd2783ba 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result_by_update_date.xml
@@ -3,8 +3,8 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,8 +28,8 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -53,8 +53,8 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="401"
-      project_id="399"
+      component_id="401"
+      root_component_id="399"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
index bed99059123..34e96a79ae9 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml
@@ -2,8 +2,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="123"
-      project_id="100"
+      component_id="123"
+      root_component_id="100"
       rule_id="200"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
index ee9bb753acd..171c7a3b4b4 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml
@@ -2,8 +2,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="123"
-      project_id="100"
+      component_id="123"
+      root_component_id="100"
       rule_id="200"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
index 9d200a67a21..c1473018a53 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml
@@ -2,8 +2,8 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="123"
-      project_id="100"
+      component_id="123"
+      root_component_id="100"
       rule_id="200"
       severity="INFO"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
index 226874e1bec..6ae5005cdf9 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
@@ -6,8 +6,8 @@
       effort_to_fix="[null]"
       message="[null]"
       line="5000"
-      resource_id="100"
-      project_id="10"
+      component_id="100"
+      root_component_id="10"
       rule_id="200"
       created_at="[null]"
       updated_at="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index 2a03f31263a..d03b9cd7523 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -11,8 +11,8 @@
           effort_to_fix="[null]"
           message="[null]"
           line="5000"
-          resource_id="100"
-          project_id="10"
+          component_id="100"
+          root_component_id="10"
           rule_id="200"
           created_at="2013-05-18"
           updated_at="2013-05-18"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 8ff383e6454..6d3ac5aa2d8 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -11,8 +11,8 @@
           effort_to_fix="[null]"
           message="[null]"
           line="3000"
-          resource_id="100"
-          project_id="10"
+          component_id="100"
+          root_component_id="10"
           rule_id="200"
           created_at="2010-01-01"
           updated_at="2011-02-02"
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index 4f5cf5e326f..d25ce652ec8 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -21,7 +21,7 @@
   <issues
       id="100"
       kee="100"
-      resource_id="400"
+      component_id="400"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -45,7 +45,7 @@
   <issues
       id="101"
       kee="101"
-      resource_id="401"
+      component_id="401"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
index 7286e76a2af..2827a85e45f 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
@@ -18,7 +18,7 @@
   <events id="1" name="Version 1.0" resource_id="1" snapshot_id="1" category="VERSION" description="[null]"
           event_date="2008-12-02 13:58:00.00" created_at="[null]"/>
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
+  <issues id="1" kee="ABCDE" component_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 2a77f9e60b7..cd02d9bb72b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -19,7 +19,7 @@
   <action_plans id="1" kee="ABCD" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]"
                 user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" />
 
-  <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
+  <issues id="1" kee="ABCDE" component_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
@@ -31,7 +31,7 @@
           issue_close_date="2013-04-16"
       />
 
-  <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
+  <issues id="2" kee="ABCDF" component_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
           message="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
index 4fac1341e9b..49fe2baa8ed 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
@@ -13,8 +13,8 @@
   <!-- old closed issues on file and project -->
   <!--
   <issues id="1" kee="ISSUE-1"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -23,8 +23,8 @@
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="2" kee="ISSUE-2"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -35,8 +35,8 @@
 
   <!-- old open issues -->
   <issues id="3" kee="ISSUE-3"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -46,8 +46,8 @@
 
   <!-- recent open and closed issues -->
   <issues id="4" kee="ISSUE-4"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -57,8 +57,8 @@
 
   <!--
   <issues id="5" kee="ISSUE-5"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
index d73273345a4..ba7573a6080 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
@@ -7,8 +7,8 @@
 
   <!-- old closed issues on file and project -->
   <issues id="1" kee="ISSUE-1"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -17,8 +17,8 @@
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="2" kee="ISSUE-2"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -29,8 +29,8 @@
 
   <!-- old open issues -->
   <issues id="3" kee="ISSUE-3"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -40,8 +40,8 @@
 
   <!-- recent open and closed issues -->
   <issues id="4" kee="ISSUE-4"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -50,8 +50,8 @@
   <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="5" kee="ISSUE-5"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
index c68ff575f93..ce95f4372ee 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
@@ -8,8 +8,8 @@
   <!-- old closed issues on file and project -> to be purged -->
   <!--
   <issues id="1" kee="ISSUE-1"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -18,8 +18,8 @@
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="2" kee="ISSUE-2"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -30,8 +30,8 @@
 
   <!-- old open issues -> do not purge -->
   <issues id="3" kee="ISSUE-3"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -41,8 +41,8 @@
 
   <!-- recent open and closed issues -> do not purge -->
   <issues id="4" kee="ISSUE-4"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -51,8 +51,8 @@
   <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="5" kee="ISSUE-5"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
index 3fc561c92d4..a50ca73937f 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
@@ -7,8 +7,8 @@
 
   <!-- old closed issues on file and project -> to be purged -->
   <issues id="1" kee="ISSUE-1"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -17,8 +17,8 @@
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="2" kee="ISSUE-2"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2010-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -29,8 +29,8 @@
 
   <!-- old open issues -> do not purge -->
   <issues id="3" kee="ISSUE-3"
-          resource_id="1"
-          project_id="1"
+          component_id="1"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -40,8 +40,8 @@
 
   <!-- recent open and closed issues -> do not purge -->
   <issues id="4" kee="ISSUE-4"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="OPEN"
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
@@ -50,8 +50,8 @@
   <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/>
 
   <issues id="5" kee="ISSUE-5"
-          resource_id="100"
-          project_id="1"
+          component_id="100"
+          root_component_id="1"
           status="CLOSED"
           issue_close_date="2025-01-01"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"