SONAR-2602 support project modules with different languages

26 files changed, 129 insertions, 145 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 8aa94e8d2a5..754d5e973b6 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -35,7 +35,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 330;
+  public static final int LAST_VERSION = 331;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL
diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
index 73ee680a5d4..a9edcb4ed19 100644
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
@@ -35,7 +35,6 @@ public final class ResourceDto {
   private String language;
   private Long copyResourceId;
   private Long personId;
-  private Long profileId;
   private Date createdAt;
 
   public Long getId() {
@@ -146,15 +145,6 @@ public final class ResourceDto {
     return this;
   }
 
-  public Long getProfileId() {
-    return profileId;
-  }
-
-  public ResourceDto setProfileId(Long profileId) {
-    this.profileId = profileId;
-    return this;
-  }
-
   public Date getCreatedAt() {
     return createdAt;// NOSONAR May expose internal representation by returning reference to mutable object
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/ProfilesDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/ProfilesDao.java
index 3721c2560dc..40ab93b9cbe 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/ProfilesDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/ProfilesDao.java
@@ -20,7 +20,6 @@
 package org.sonar.jpa.dao;
 
 import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.database.model.ResourceModel;
 import org.sonar.api.profiles.RulesProfile;
 
 public class ProfilesDao extends BaseDao {
@@ -29,16 +28,12 @@ public class ProfilesDao extends BaseDao {
     super(session);
   }
 
-  public RulesProfile getActiveProfile(String languageKey, String projectResourceKey) {
-    ResourceModel projectResource = getSession().getSingleResult(ResourceModel.class, "key", projectResourceKey, "scope", ResourceModel.SCOPE_PROJECT);
-    if (projectResource != null && projectResource.getRulesProfile() != null && projectResource.getRulesProfile().isEnabled()) {
-      return projectResource.getRulesProfile();
-    }
-    return getSession().getSingleResult(RulesProfile.class, "defaultProfile", true, "language", languageKey, "enabled", true);
+  public RulesProfile getDefaultProfile(String languageKey) {
+    return getSession().getSingleResult(RulesProfile.class, "defaultProfile", true, "language", languageKey);
   }
 
   public RulesProfile getProfile(String languageKey, String profileName) {
-    return getSession().getSingleResult(RulesProfile.class, "language", languageKey, "name", profileName, "enabled", true);
+    return getSession().getSingleResult(RulesProfile.class, "language", languageKey, "name", profileName);
   }
 
 }
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 9b7211d2862..05b077452b2 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -172,6 +172,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('306');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('320');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('321');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('330');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('331');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
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 a66ee4b5f0f..53e322fc449 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
@@ -293,7 +293,6 @@ CREATE TABLE "PROJECTS" (
   "QUALIFIER" VARCHAR(10),
   "KEE" VARCHAR(400),
   "ROOT_ID" INTEGER,
-  "PROFILE_ID" INTEGER,
   "LANGUAGE" VARCHAR(5),
   "COPY_RESOURCE_ID" INTEGER,
   "LONG_NAME" VARCHAR(256),
diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
index 1d51aff6cc6..e35451c4f6e 100644
--- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
@@ -34,7 +34,6 @@
     <result property="language" column="language"/>
     <result property="copyResourceId" column="copy_resource_id"/>
     <result property="personId" column="person_id"/>
-    <result property="profileId" column="profile_id"/>
     <result property="createdAt" column="created_at"/>
   </resultMap>
 
@@ -86,11 +85,11 @@
 
   <insert id="insert" parameterType="Resource" useGeneratedKeys="true" keyProperty="id">
     insert into projects
-    (name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, profile_id, enabled, created_at)
+    (name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, enabled, created_at)
     values (
     #{name}, #{longName}, #{description}, #{scope}, #{qualifier},
     #{key}, #{language}, #{rootId}, #{copyResourceId},
-    #{personId}, #{profileId}, #{enabled}, #{createdAt}
+    #{personId}, #{enabled}, #{createdAt}
     )
   </insert>
 
@@ -100,11 +99,11 @@
       select projects_seq.NEXTVAL from DUAL
     </selectKey>
     insert into projects
-    (id, name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, profile_id, enabled, created_at)
+    (id, name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, enabled, created_at)
     values (
     #{id}, #{name}, #{longName}, #{description}, #{scope}, #{qualifier},
     #{key}, #{language}, #{rootId}, #{copyResourceId},
-    #{personId}, #{profileId}, #{enabled}, #{createdAt}
+    #{personId}, #{enabled}, #{createdAt}
     )
   </insert>
 
@@ -112,7 +111,7 @@
     update projects set name=#{name}, long_name=#{longName}, description=#{description},
     scope=#{scope}, qualifier=#{qualifier}, kee=#{key},
     language=#{language}, root_id=#{rootId}, copy_resource_id=#{copyResourceId},
-    person_id=#{personId}, profile_id=#{profileId}, enabled=#{enabled} where id=#{id}
+    person_id=#{personId}, enabled=#{enabled} where id=#{id}
   </update>
 </mapper>
 
diff --git a/sonar-core/src/test/java/org/sonar/jpa/dao/ProfilesDaoTest.java b/sonar-core/src/test/java/org/sonar/jpa/dao/ProfilesDaoTest.java
index 0ab2cf17506..01f7310fca0 100644
--- a/sonar-core/src/test/java/org/sonar/jpa/dao/ProfilesDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/dao/ProfilesDaoTest.java
@@ -21,12 +21,10 @@ package org.sonar.jpa.dao;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.api.database.model.ResourceModel;
 import org.sonar.api.profiles.RulesProfile;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.fest.assertions.Assertions.assertThat;
 
 public class ProfilesDaoTest extends AbstractDbUnitTestCase {
 
@@ -37,22 +35,24 @@ public class ProfilesDaoTest extends AbstractDbUnitTestCase {
     profilesDao = new ProfilesDao(getSession());
   }
 
+  @Test
+  public void should_get_profile_by_name() {
+    RulesProfile profile = RulesProfile.create("my profile", "java");
+    getSession().save(profile);
+
+    assertThat(profilesDao.getProfile("unknown language", "my profile")).isNull();
+    assertThat(profilesDao.getProfile("java", "my profile").getName()).isEqualTo("my profile");
+  }
 
   @Test
-  public void testGetActiveProfile() {
-    RulesProfile testDefaultProfile = new RulesProfile("default", "java", true, true);
-    RulesProfile testProfile = new RulesProfile("not default", "java", false, false);
-    getSession().save(testDefaultProfile, testProfile);
-
-    ResourceModel testResourceWithProfile = new ResourceModel(ResourceModel.SCOPE_PROJECT, "withProfile", "TRK", null, "test");
-    testResourceWithProfile.setRulesProfile(testProfile);
-    ResourceModel testResourceWithNoProfile = new ResourceModel(ResourceModel.SCOPE_PROJECT, "withoutProfile", "TRK", null, "test");
-    getSession().save(testResourceWithProfile, testResourceWithNoProfile);
-
-    assertNull(profilesDao.getActiveProfile("wrongLanguage", "withoutProfile"));
-    assertEquals(testDefaultProfile.getId(), profilesDao.getActiveProfile("java", "wrongKey").getId());
-    assertEquals(testDefaultProfile.getId(), profilesDao.getActiveProfile("java", "withoutProfile").getId());
-    assertEquals(testProfile.getId(), profilesDao.getActiveProfile("java", "withProfile").getId());
+  public void should_get_default_profile() {
+    RulesProfile defaultProfile = RulesProfile.create("default profile", "java");
+    defaultProfile.setDefaultProfile(true);
+    RulesProfile otherProfile = RulesProfile.create("other profile", "java");
+    otherProfile.setDefaultProfile(false);
+    getSession().save(defaultProfile, otherProfile);
+
+    assertThat(profilesDao.getDefaultProfile("java").getName()).isEqualTo("default profile");
   }
 
 }
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 d9fe0172ed6..ff3b37a56ea 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
@@ -2,7 +2,7 @@
 
   <projects id="1" enabled="[true]" root_id="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]"
              status="P" islast="[false]" purge_status="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
index 7f21ab01f6e..4e982e4dc12 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
@@ -8,7 +8,7 @@ Snapshot 2 has been deleted
   <!-- the project -->
   <projects id="1" enabled="[true]" root_id="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- past snapshot with status "processed" and already purged -->
   <snapshots id="1"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml
index da6f52837c7..34716adee47 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml
@@ -3,7 +3,7 @@
   <!-- the project -->
   <projects id="1" enabled="[true]" root_id="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- past snapshot with status "processed" and already purged -->
   <snapshots id="1"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
index 5a659ed2b14..83f1ff3676e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
@@ -9,17 +9,17 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6
   <!-- the project -->
   <projects id="1" enabled="[true]" root_id="[null]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the directory -->
   <projects id="2" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the file -->
   <projects id="3" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- do not purge last snapshots -->
   <snapshots id="1"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
index 49f63da1e7f..a3445a40a64 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
@@ -3,17 +3,17 @@
   <!-- the project -->
   <projects id="1" enabled="[true]" root_id="[null]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the directory -->
   <projects id="2" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the file -->
   <projects id="3" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- do not purge last snapshots -->
   <snapshots id="1"
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 66d6efd5e73..8888c64bb0f 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
@@ -3,7 +3,7 @@
   <!-- root -->
   <projects id="1" enabled="[true]" root_id="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]"
              status="P" islast="[false]" purge_status="[null]"
@@ -34,7 +34,7 @@
   <!-- modules -->
   <projects id="2" enabled="[true]" root_id="1"
             long_name="[null]" scope="PRJ" qualifier="BRC" kee="module1" name="module1"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1"
              status="P" islast="[false]" purge_status="[null]"
@@ -50,7 +50,7 @@
 
   <projects id="3" enabled="[false]" root_id="1"
             long_name="[null]" scope="PRJ" qualifier="BRC" kee="module2" name="module2"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="3" project_id="3" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1"
              status="P" islast="[true]" purge_status="[null]"
@@ -66,7 +66,7 @@
   <!-- file of module 2-->
   <projects id="4" enabled="[false]" root_id="3"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="module2:File.java" name="File"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1"
              status="P" islast="[true]" purge_status="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml
index b14e00595da..96c616fb46f 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml
@@ -10,17 +10,17 @@ What has been changed :
   <!-- the project -->
   <projects id="1" enabled="[false]" root_id="[null]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the directory -->
   <projects id="2" enabled="[false]" root_id="1" created_at="[null]"
             long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the file -->
   <projects id="3" enabled="[false]" root_id="1" created_at="[null]"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="1"
              project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml
index 05bb41f18f6..b943a8f0ea6 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml
@@ -3,17 +3,17 @@
   <!-- the project -->
   <projects id="1" enabled="[true]" root_id="[null]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the directory -->
   <projects id="2" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <!-- the file -->
   <projects id="3" enabled="[true]" root_id="1" created_at="[null]"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java"
-            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
   <snapshots id="1"
              project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml
index 0adc84368f7..d80268aff4e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml
@@ -3,7 +3,7 @@
   <!-- the project -->
   <projects id="1" enabled="[true]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
 
   <!-- snapshot already purged -->
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml
index a38c88faa59..23490655cbe 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml
@@ -3,7 +3,7 @@
   <!-- the project -->
   <projects id="1" enabled="[true]" created_at="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
-            root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/>
+            root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" />
 
 
   <!-- snapshot already purged -->
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml
index 0b7b9325056..27016ad3471 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml
@@ -2,10 +2,10 @@
 
   <projects id="1" root_id="[null]" scope="FIL" qualifier="FIL" kee="org.struts:struts:org.struts.Action" name="Action"
             description="[null]" long_name="org.struts.Action"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]" created_at="[null]"/>
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
 
   <projects id="2" root_id="[null]" scope="FIL" qualifier="FIL" kee="org.struts:struts:org.struts.Filter" name="Filter"
             description="[null]" long_name="org.struts.Filter"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]" created_at="[null]"/>
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml
index 05ef16cbee5..4a59dd793f1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml
@@ -2,6 +2,6 @@
 
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
             description="MVC Framework" long_name="Apache Struts"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]" created_at="[null]"/>
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml
index 74ff92ef743..dcd5ae6480b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml
@@ -2,6 +2,6 @@
 
   <projects id="1" root_id="200" scope="PRJ" qualifier="TRK" kee="old key" name="old name"
             description="old name" long_name="old long name"
-            enabled="[false]" language="old" copy_resource_id="2" person_id="3" profile_id="4" created_at="[null]"/>
+            enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml
index dff49673540..4613c167d31 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml
@@ -2,49 +2,49 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
+            description="[null]" long_name="Apache Struts"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** First sub project **************** -->
   <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
+            scope="PRJ" qualifier="BRC" long_name="Struts Core"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
+              description="[null]"
               enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
+            description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project **************** -->
   <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
+            scope="PRJ" qualifier="BRC" long_name="Struts UI"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="org.struts:struts-ui:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
+              description="[null]"
               enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-ui:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
+            description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Another independent project **************** -->
   <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" profile_id="1"
+            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
index a4b3fdd195e..b9fc934e546 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
@@ -2,49 +2,49 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]" long_name="Apache Struts"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** First sub project **************** -->
   <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts Core"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.apache.struts:struts-core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]"
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project **************** -->
   <projects id="5" root_id="1" kee="org.apache.struts:struts-ui" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts UI"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="org.apache.struts:struts-ui:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]"
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-ui:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Another independent project **************** -->
   <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
index 40bb3ed144d..71ed68a61ae 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
@@ -2,49 +2,49 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]" long_name="Apache Struts"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** First sub project **************** -->
   <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts Core"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]"
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project **************** -->
   <projects id="5" root_id="1" kee="org.struts:struts-web" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts UI"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="org.struts:struts-web:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]"
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-web:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]"
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Another independent project **************** -->
   <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core"
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
index 6ebe224cfaf..54bf43d5802 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
@@ -2,43 +2,43 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]" long_name="Apache Struts" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** First sub project **************** -->
   <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts Core" 
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.apache.struts:struts-core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]" 
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project THAT HAS A DIFFERENT GROUP ID => MUST NOT BE UPDATED **************** -->
   <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            scope="PRJ" qualifier="BRC" long_name="Struts UI" 
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="foo:struts-ui:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+              description="[null]" 
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="foo:struts-ui:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" />
+            description="[null]" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
index 1b33265baeb..93f747e9d72 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
@@ -2,43 +2,43 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+            description="[null]" long_name="Apache Struts" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** First sub project **************** -->
   <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+            scope="PRJ" qualifier="BRC" long_name="Struts Core" 
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+              description="[null]" 
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+            description="[null]" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project THAT HAS A DIFFERENT GROUP ID => MUST NOT BE UPDATED **************** -->
   <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+            scope="PRJ" qualifier="BRC" long_name="Struts UI" 
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="foo:struts-ui:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
-              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+              description="[null]" 
+              enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="foo:struts-ui:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
-            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
+            description="[null]" 
+            enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml
index 5680e1d1814..178b172ddd0 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml
@@ -2,7 +2,7 @@
 
   <!-- root project -->
   <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
-            description="[null]" long_name="Apache Struts" profile_id="1"
+            description="[null]" long_name="Apache Struts" 
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
@@ -10,43 +10,43 @@
   <!-- ONLY THIS PROJECT MUST HAVE BEEN UPDATED            -->
   <!--                                                     -->
   <projects id="2" root_id="1" kee="struts:core" name="Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Struts Core" profile_id="1"
-            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
+            scope="PRJ" qualifier="BRC" long_name="Struts Core" 
+            description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="struts:core:org.struts"
               name="org.struts" root_id="2"
-              description="[null]" profile_id="1"
+              description="[null]" 
               enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="struts:core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
-            description="[null]" profile_id="1"
+            description="[null]" 
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Second sub project **************** -->
   <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI"
-            scope="PRJ" qualifier="BRC" long_name="Struts UI" profile_id="1"
+            scope="PRJ" qualifier="BRC" long_name="Struts UI" 
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="org.struts:struts-ui:org.struts"
               name="org.struts" root_id="5"
-              description="[null]" profile_id="1"
+              description="[null]" 
               enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-ui:org.struts.RequestContext"
             name="RequestContext" root_id="5"
-            description="[null]" profile_id="1"
+            description="[null]" 
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 
   <!-- **************** Another independent project **************** -->
   <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core"
-            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" profile_id="1"
+            scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" 
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]"/>
 
 </dataset>