]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-8155 support root in UserDto, UserDao and UTs
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>
Mon, 3 Oct 2016 13:13:22 +0000 (15:13 +0200)
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>
Wed, 12 Oct 2016 10:24:28 +0000 (12:24 +0200)
81 files changed:
server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/no_authorization.xml
server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/shared.xml
server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationIndexerTest/index.xml
server/sonar-server/src/test/resources/org/sonar/server/user/DeprecatedUserFinderTest/fixture.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserCreatorTest/fail_to_create_user_if_already_exists.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_reactivating_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_updating_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used_by_many_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_reactivate_user_if_not_disabled.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_update_user_when_scm_account_is_already_used.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/not_associate_default_group_when_updating_user_if_already_existing.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user_not_having_password.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_technical_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_user.xml
server/sonar-server/src/test/resources/org/sonar/server/user/index/UserIndexerTest/index.xml
server/sonar-server/src/test/resources/org/sonar/server/user/index/UserResultSetIteratorTest/shared.xml
sonar-db/src/main/java/org/sonar/db/user/UserDto.java
sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml
sonar-db/src/test/java/org/sonar/db/charset/SqlExecutorTest.java
sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml
sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml
sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml
sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_group_anyone.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_group_global_permissions.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_user_global_permissions.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_count_component_permissions.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions-result.xml
sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions.xml
sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml
sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions.xml
sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml
sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml
sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml
sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_count_component_permissions.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions-result.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml
sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/exists_by_email.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByIds.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_by_login.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account_return_many_results_when_same_email_is_used_by_many_users.xml
sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml

index 870e665683f9a99b3e60ec59351e52c725525e26..2145b3a4cf948bdefbdce46855bd5f46a20ec45c 100644 (file)
@@ -24,7 +24,8 @@
          login="user1"
          name="User 1"
          email="user1@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
   <groups id="100"
           name="devs"/>
 
index fd8f98276bb0489d8336af921c6b698f62c14438..a360a813b0c4e0d67f6f65a4a73dbeba1bb0ba18 100644 (file)
@@ -41,7 +41,8 @@
          login="user1"
          name="User 1"
          email="user1@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
   <user_roles id="1"
               user_id="10"
               resource_id="1"
@@ -86,7 +87,8 @@
          login="user2"
          name="User 2"
          email="user2@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
   <user_roles id="4"
               user_id="11"
               resource_id="1"
index 6700e00ccbe3a237a2cf4bdc6adf29adc217de4c..25864891fe3ad9dcf56a5916e5891a2c1486a064 100644 (file)
@@ -22,7 +22,8 @@
          login="user1"
          name="User 1"
          email="user1@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
   <user_roles id="1"
               user_id="10"
               resource_id="1"
index 9d370e86a70f6eb54f9604ac4d91378118e2ecb2..9a2455b367150f2af61c4f73a25cac78aa23cffe 100644 (file)
@@ -1,6 +1,14 @@
 <dataset>
 
-  <users id="1" login="simon" name="Simon Brandhof" email="simon.brandhof@sonarsource.com"/>
-  <users id="2" login="godin" name="Evgeny Mandrikov" email="evgeny.mandrikov@sonarsource.com"/>
+  <users id="1"
+         login="simon"
+         name="Simon Brandhof"
+         email="simon.brandhof@sonarsource.com"
+         is_root="[false]"/>
+  <users id="2"
+         login="godin"
+         name="Evgeny Mandrikov"
+         email="evgeny.mandrikov@sonarsource.com"
+         is_root="[false]"/>
 
 </dataset>
index 926b75324ad7b9f3000a788f868844ebd6a88787..b2dce4244c127f4c5d5f2981ec710803ade843a5 100644 (file)
@@ -1,6 +1,15 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 40485114bc3c2dd072b6f7f7f3eccaf0dc1fb85f..d2470c724abf23f92784a218d67cba980d6b7586 100644 (file)
@@ -1,12 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[false]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[false]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
-  <groups id="1" name="sonar-devs" description="Sonar Devs" created_at="2014-09-08" updated_at="2014-09-08"/>
+  <groups id="1"
+          name="sonar-devs"
+          description="Sonar Devs"
+          created_at="2014-09-08"
+          updated_at="2014-09-08"/>
 
-  <groups_users user_id="101" group_id="1"/>
+  <groups_users user_id="101"
+                group_id="1"/>
 
 </dataset>
index 146d6a2893c5e61a5ad3640fe13de604a1628061..08f40c9808e1fae094271542ee91b679ce23b38f 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index c7ed6aa3f750707323b5e9782d450cad880fd1e7..f36944db0b482e3185c3c231fc1048a75e19bf59 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="john" name="John" email="john@email.com" active="[true]" scm_accounts="&#10;jo&#10;"
-         external_identity_provider="sonarqube" external_identity="john"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="john"
+         name="John"
+         email="john@email.com"
+         active="[true]"
+         scm_accounts="&#10;jo&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="john"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index e44742a1dfb2300c522733c345976d4bf01810bf..b65100a6f01d0969e07ad739e5960fe254a16564 100644 (file)
@@ -1,13 +1,31 @@
 <dataset>
 
-  <users id="101" login="john" name="John" email="john@email.com" active="[true]" scm_accounts="&#10;jo&#10;"
-         external_identity_provider="sonarqube" external_identity="john"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="john"
+         name="John"
+         email="john@email.com"
+         active="[true]"
+         scm_accounts="&#10;jo&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="john"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
-  <users id="102" login="technical-account" name="Technical account" email="john@email.com" active="[true]" scm_accounts="[null]"
-         external_identity_provider="sonarqube" external_identity="technical-account"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="102"
+         login="technical-account"
+         name="Technical account"
+         email="john@email.com"
+         active="[true]"
+         scm_accounts="[null]"
+         external_identity_provider="sonarqube"
+         external_identity="technical-account"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 146d6a2893c5e61a5ad3640fe13de604a1628061..08f40c9808e1fae094271542ee91b679ce23b38f 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 9704668e7ab335c07a73744a2ca411eabc1b8e7c..a10f24b645c2ba809a920497bb59ee08a25d163e 100644 (file)
@@ -1,12 +1,30 @@
 <dataset>
 
-  <users id="101" login="john" name="John" email="john@email.com" active="[true]" scm_accounts="&#10;jo&#10;"
-         external_identity_provider="sonarqube" external_identity="john"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
-  <users id="102" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="john"
+         name="John"
+         email="john@email.com"
+         active="[true]"
+         scm_accounts="&#10;jo&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="john"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
+  <users id="102"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 7b3b2790fee7f7a13a571511aa4aa3c6fd8107ac..ea65c7abcfd428795f8e4a8ffe52f0f4b1637b19 100644 (file)
@@ -1,12 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
-  <groups id="1" name="sonar-users" description="Sonar Users" created_at="2014-09-08" updated_at="2014-09-08"/>
+  <groups id="1"
+          name="sonar-users"
+          description="Sonar Users"
+          created_at="2014-09-08"
+          updated_at="2014-09-08"/>
 
-  <groups_users user_id="101" group_id="1"/>
+  <groups_users user_id="101"
+                group_id="1"/>
 
 </dataset>
index 372d5dbc4e971f012e96c986c09ee0aaf7cf7ca1..67e879dd473df84884ecb62d61b5273c187e03f4 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[false]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[false]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index adcf3cffccf289f38ac7c041c10006c7cb3b4f1a..bdb52c47db65139c6a312b317871774cdf1c31c4 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[false]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="[null]" crypted_password="[null]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[false]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="[null]"
+         crypted_password="[null]"
+         is_root="[false]"/>
 
 </dataset>
index 520f88305602e5ede323b7cadcedea2aa9f56ad7..69c94f84f9878c4f554ffac05bf10c8a5b97846d 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="tech_user" name="Tech user" email="tech@user.fr" active="[true]" scm_accounts="[null]"
-         external_identity_provider="sonarqube" external_identity="tech_user"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="tech_user"
+         name="Tech user"
+         email="tech@user.fr"
+         active="[true]"
+         scm_accounts="[null]"
+         external_identity_provider="sonarqube"
+         external_identity="tech_user"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 146d6a2893c5e61a5ad3640fe13de604a1628061..08f40c9808e1fae094271542ee91b679ce23b38f 100644 (file)
@@ -1,8 +1,17 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;"
-         external_identity_provider="sonarqube" external_identity="marius"
-         created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         external_identity_provider="sonarqube"
+         external_identity="marius"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
 
 </dataset>
index 013dd721b608fed9250a5322b53b7cec67b86b8f..5ff55705813cb618b6340db401399654a55e2885 100644 (file)
@@ -1,9 +1,13 @@
 <dataset>
 
-  <users id="1" login="user1" name="User1" email="user1@mail.com" active="[true]"
+  <users id="1"
+         login="user1"
+         name="User1"
+         email="user1@mail.com"
+         active="[true]"
          scm_accounts="&#10;user_1&#10;u1&#10;"
          created_at="1500000000000"
          updated_at="1500000000000"
-      />
+         is_root="[false]"/>
 
 </dataset>
index 077fc76c2ee9c1d3ed6d2351945fc5b5ed8a207a..6af8bdfcb840aa4e577f8a13c2f45d659e55b9f0 100644 (file)
@@ -1,23 +1,35 @@
 <dataset>
 
-  <users id="1" login="user1" name="User1" email="user1@mail.com" active="[true]"
+  <users id="1"
+         login="user1"
+         name="User1"
+         email="user1@mail.com"
+         active="[true]"
          scm_accounts="&#10;user_1&#10;u1&#10;"
          created_at="1500000000000"
          updated_at="1500000000000"
-      />
+         is_root="[false]"/>
 
   <!-- scm accounts with comma -->
-  <users id="2" login="user2" name="User2" email="user2@mail.com" active="[true]"
+  <users id="2"
+         login="user2"
+         name="User2"
+         email="user2@mail.com"
+         active="[true]"
          scm_accounts="&#10;user,2&#10;user_2&#10;"
          created_at="1500000000000"
          updated_at="1500000000000"
-      />
+         is_root="[false]"/>
 
   <!--no scm account, no email -->
-  <users id="3" login="user3" name="User3" email="[null]" active="[false]"
+  <users id="3"
+         login="user3"
+         name="User3"
+         email="[null]"
+         active="[false]"
          scm_accounts="[null]"
          created_at="1500000000000"
          updated_at="1550000000000"
-      />
+         is_root="[false]"/>
 
 </dataset>
index 826317bcc8701458d6d64ef1189e612f446dc554..df3d9e02726ae8b90070c3aaa70ccc5ca7ae0fd5 100644 (file)
@@ -50,6 +50,7 @@ public class UserDto {
   private Long createdAt;
   private Long updatedAt;
   private boolean local = true;
+  private boolean root = false;
 
   public Long getId() {
     return id;
@@ -201,6 +202,21 @@ public class UserDto {
     return this;
   }
 
+  public boolean isRoot() {
+    return root;
+  }
+
+  /**
+   * Setters is not accessible as dedicated requests must be used to update the root flag of a user:
+   * <ul>
+   *   <li>a user can not be created root</li>
+   *   <li>the generic update method of a user can not change its root flag</li>
+   * </ul>
+   */
+  private void setRoot(boolean root) {
+    this.root = root;
+  }
+
   public static String encryptPassword(String password, String salt) {
     requireNonNull(password, "Password cannot be empty");
     requireNonNull(salt, "Salt cannot be empty");
index 0f79a72e8406cd9712bbc901e2e0ce1834621946..2501f68c68fd4494200c6ac7fe539765b85da00b 100644 (file)
@@ -15,6 +15,7 @@
     u.external_identity as "externalIdentity",
     u.external_identity_provider as "externalIdentityProvider",
     u.user_local as "local",
+    u.is_root as "root",
     u.created_at as "createdAt",
     u.updated_at as "updatedAt"
   </sql>
   </delete>
 
   <update id="deactivateUser" parameterType="long">
-    UPDATE users SET active=${_false}, email=null, scm_accounts=null,
-    external_identity=null, external_identity_provider=null,
-    salt=null, crypted_password=null,
-    updated_at=#{now,jdbcType=BIGINT} WHERE id=#{id}
+    UPDATE users SET
+      active=${_false},
+      email=null,
+      scm_accounts=null,
+      external_identity=null,
+      external_identity_provider=null,
+      salt=null,
+      crypted_password=null,
+      updated_at=#{now,jdbcType=BIGINT}
+    WHERE
+      id=#{id}
   </update>
 
   <insert id="insert" parameterType="User" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
-    INSERT INTO users (login, name, email, active, scm_accounts, external_identity, external_identity_provider, user_local, salt, crypted_password, created_at, updated_at)
-    VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN},
-    #{scmAccounts,jdbcType=VARCHAR}, #{externalIdentity,jdbcType=VARCHAR}, #{externalIdentityProvider,jdbcType=VARCHAR},
-    #{local,jdbcType=BOOLEAN},
-    #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR},
-    #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT})
+    INSERT INTO users (
+      login,
+      name,
+      email,
+      active,
+      scm_accounts,
+      external_identity,
+      external_identity_provider,
+      user_local,
+      salt,
+      crypted_password,
+      is_root,
+      created_at,
+      updated_at
+    )
+    VALUES (
+      #{login,jdbcType=VARCHAR},
+      #{name,jdbcType=VARCHAR},
+      #{email,jdbcType=VARCHAR},
+      #{active,jdbcType=BOOLEAN},
+      #{scmAccounts,jdbcType=VARCHAR},
+      #{externalIdentity,jdbcType=VARCHAR},
+      #{externalIdentityProvider,jdbcType=VARCHAR},
+      #{local,jdbcType=BOOLEAN},
+      #{salt,jdbcType=VARCHAR},
+      #{cryptedPassword,jdbcType=VARCHAR},
+      #{root,jdbcType=BOOLEAN},
+      #{createdAt,jdbcType=BIGINT},
+      #{updatedAt,jdbcType=BIGINT}
+    )
   </insert>
 
   <insert id="update" parameterType="User" useGeneratedKeys="false">
-    UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN},
-    scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, external_identity=#{externalIdentity,jdbcType=VARCHAR}, external_identity_provider=#{externalIdentityProvider,jdbcType=VARCHAR},
-    user_local=#{local,jdbcType=BOOLEAN},
-    salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT},
-    updated_at=#{updatedAt,jdbcType=BIGINT}
-    WHERE login = #{login}
+    UPDATE users set
+      name=#{name,jdbcType=VARCHAR},
+      email=#{email,jdbcType=VARCHAR},
+      active=#{active,jdbcType=BOOLEAN},
+      scm_accounts=#{scmAccounts,jdbcType=VARCHAR},
+      external_identity=#{externalIdentity,jdbcType=VARCHAR},
+      external_identity_provider=#{externalIdentityProvider,jdbcType=VARCHAR},
+      user_local=#{local,jdbcType=BOOLEAN},
+      salt=#{salt,jdbcType=VARCHAR},
+      crypted_password=#{cryptedPassword,jdbcType=BIGINT},
+      updated_at=#{updatedAt,jdbcType=BIGINT}
+    WHERE
+      login = #{login}
   </insert>
 
 </mapper>
index f107e2bb5c39e510cc596ca5ef61b4964f993910..c9ac2e5594abeff2a0b1fc3d82444a15ca3ff692 100644 (file)
@@ -19,7 +19,6 @@
  */
 package org.sonar.db.charset;
 
-import com.google.common.collect.ImmutableMap;
 import java.sql.Connection;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +37,7 @@ public class SqlExecutorTest {
   private static final String LOGIN_DB_COLUMN = "login";
   private static final String NAME_DB_COLUMN = "name";
   private static final String USERS_DB_TABLE = "users";
+  private static final String IS_ROOT_DB_COLUMN = "is_root";
 
   SqlExecutor underTest = new SqlExecutor();
 
@@ -54,8 +54,8 @@ public class SqlExecutorTest {
 
   @Test
   public void executeSelect_executes_PreparedStatement() throws Exception {
-    dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "login1", NAME_DB_COLUMN, "name one"));
-    dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "login2", NAME_DB_COLUMN, "name two"));
+    dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "login1", NAME_DB_COLUMN, "name one", IS_ROOT_DB_COLUMN, false);
+    dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "login2", NAME_DB_COLUMN, "name two", IS_ROOT_DB_COLUMN, false);
 
     try (Connection connection = dbTester.openConnection()) {
       List<String[]> users = underTest.select(connection, "select " + LOGIN_DB_COLUMN + ", " + NAME_DB_COLUMN + " from users order by id", new SqlExecutor.StringsConverter(
@@ -70,7 +70,7 @@ public class SqlExecutorTest {
 
   @Test
   public void executeUpdate_executes_PreparedStatement() throws Exception {
-    dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "the_login", NAME_DB_COLUMN, "the name"));
+    dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "the_login", NAME_DB_COLUMN, "the name", IS_ROOT_DB_COLUMN, false);
 
     try (Connection connection = dbTester.openConnection()) {
       underTest.executeDdl(connection, "update users set " + NAME_DB_COLUMN + "='new name' where " + LOGIN_DB_COLUMN + "='the_login'");
index 30f7a27cf477ac328ffe294d91d1f613bf729a92..5a6b8a02cbabee3d8d5db54bc24e4ef458adb3ef 100644 (file)
@@ -53,21 +53,18 @@ import static org.sonar.db.user.GroupMembershipQuery.builder;
 import static org.sonar.db.user.UserTesting.newUserDto;
 
 public class UserDaoTest {
+  private static final long NOW = 1500000000000L;
+
+  private System2 system2 = mock(System2.class);
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
-
-  System2 system2 = mock(System2.class);
-
   @Rule
   public DbTester db = DbTester.create(system2);
 
-  static final long NOW = 1500000000000L;
-
-  DbClient dbClient = db.getDbClient();
-
-  UserDao underTest = db.getDbClient().userDao();
-  final DbSession session = db.getSession();
+  private DbClient dbClient = db.getDbClient();
+  private DbSession session = db.getSession();
+  private UserDao underTest = db.getDbClient().userDao();
 
   @Before
   public void setUp() throws Exception {
@@ -229,6 +226,7 @@ public class UserDaoTest {
     assertThat(user.getExternalIdentity()).isEqualTo("johngithub");
     assertThat(user.getExternalIdentityProvider()).isEqualTo("github");
     assertThat(user.isLocal()).isTrue();
+    assertThat(user.isRoot()).isFalse();
     assertThat(user.getCreatedAt()).isEqualTo(date);
     assertThat(user.getUpdatedAt()).isEqualTo(date);
   }
@@ -275,6 +273,7 @@ public class UserDaoTest {
     assertThat(user.getExternalIdentity()).isEqualTo("johngithub");
     assertThat(user.getExternalIdentityProvider()).isEqualTo("github");
     assertThat(user.isLocal()).isFalse();
+    assertThat(user.isRoot()).isFalse();
     assertThat(user.getCreatedAt()).isEqualTo(1418215735482L);
     assertThat(user.getUpdatedAt()).isEqualTo(1500000000000L);
   }
@@ -307,6 +306,7 @@ public class UserDaoTest {
     assertThat(userReloaded.getCryptedPassword()).isNull();
     assertThat(userReloaded.getExternalIdentity()).isNull();
     assertThat(userReloaded.getExternalIdentityProvider()).isNull();
+    assertThat(userReloaded.isRoot()).isFalse();
     assertThat(userReloaded.getUpdatedAt()).isEqualTo(NOW);
 
     assertThat(underTest.selectUserById(session, otherUser.getId())).isNotNull();
@@ -409,8 +409,12 @@ public class UserDaoTest {
     assertThat(dto.getScmAccountsAsList()).containsOnly("ma", "marius33");
     assertThat(dto.getSalt()).isEqualTo("79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365");
     assertThat(dto.getCryptedPassword()).isEqualTo("650d2261c98361e2f67f90ce5c65a95e7d8ea2fg");
+    assertThat(dto.isRoot()).isFalse();
     assertThat(dto.getCreatedAt()).isEqualTo(1418215735482L);
     assertThat(dto.getUpdatedAt()).isEqualTo(1418215735485L);
+
+    dto = underTest.selectOrFailByLogin(session, "sbrandhof");
+    assertThat(dto.isRoot()).isTrue();
   }
 
   @Test
index 5318ae070935efb4dcbe0cbc422dcab950018c65..9ead92bbb12a83465947bd16212519b6d9f39c69 100644 (file)
@@ -1,32 +1,81 @@
 <dataset>
-  <projects id="123" kee="com.foo:bar"/>
+  <projects id="123"
+            kee="com.foo:bar"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!--
   new rows : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer),
    -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
-  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="4"
+               group_id="101"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="5"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="6"
+               group_id="101"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="7"
+               group_id="[null]"
+               resource_id="123"
+               role="codeviewer"/>
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_template_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_template_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
   <perm_templates_users/>
 
index 1291c08b42a6be00048078c337c81e94af7e2545..609b3e57739860c90ccaac9edc7100fc69998aeb 100644 (file)
@@ -1,25 +1,59 @@
 <dataset>
 
-  <projects id="123" kee="com.foo:bar"/>
-
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <projects id="123"
+            kee="com.foo:bar"/>
+
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_template_20130101_010203"/>
-
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_template_20130101_010203"/>
+
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
   <perm_templates_users/>
 
index 9ada7f379cbdfecfca17ff9c58641d767813fe57..3402bd2adcf74094476f8d533092c218c0b81965 100644 (file)
@@ -1,34 +1,79 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <groups id="102" name="sonar-foos"/>
-  <groups id="103" name="sonar-bars"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <groups id="102"
+          name="sonar-foos"/>
+  <groups id="103"
+          name="sonar-bars"/>
 
-  <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/>
-  <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/>
+  <users id="200"
+         login="foo"
+         name="Foo"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="bar"
+         name="Bar"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!--
   new rows
    -->
-  <group_roles id="3" group_id="102" resource_id="123" role="user"/>
+  <group_roles id="3"
+               group_id="102"
+               resource_id="123"
+               role="user"/>
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default"
+                        key_pattern="[null]"/>
 
-  <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/>
-  <permission_templates id="3" name="Start with bar" kee="bar_tmpl" key_pattern="bar\..*"/>
+  <permission_templates id="2"
+                        name="Start with foo"
+                        kee="foo_tmpl"
+                        key_pattern="foo\..*"/>
+  <permission_templates id="3"
+                        name="Start with bar"
+                        kee="bar_tmpl"
+                        key_pattern="bar\..*"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
 
-  <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/>
+  <perm_templates_groups id="2"
+                         template_id="2"
+                         group_id="102"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="3"
+                         group_id="103"
+                         permission_reference="user"/>
 
   <perm_templates_users/>
 
index 667ef671ce1d4c8a3ae1c7e3fab3d188ddb4af13..fa4c829202c7224542df2d51be6b160e61321e25 100644 (file)
@@ -1,30 +1,72 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <groups id="102" name="sonar-foos"/>
-  <groups id="103" name="sonar-bars"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <groups id="102"
+          name="sonar-foos"/>
+  <groups id="103"
+          name="sonar-bars"/>
 
-  <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/>
-  <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/>
+  <users id="200"
+         login="foo"
+         name="Foo"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="bar"
+         name="Bar"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default"
+                        key_pattern="[null]"/>
 
-  <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/>
-  <permission_templates id="3" name="Start with bar" kee="bar_tmpl" key_pattern="bar\..*"/>
+  <permission_templates id="2"
+                        name="Start with foo"
+                        kee="foo_tmpl"
+                        key_pattern="foo\..*"/>
+  <permission_templates id="3"
+                        name="Start with bar"
+                        kee="bar_tmpl"
+                        key_pattern="bar\..*"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
 
-  <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/>
+  <perm_templates_groups id="2"
+                         template_id="2"
+                         group_id="102"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="3"
+                         group_id="103"
+                         permission_reference="user"/>
 
   <perm_templates_users/>
 
index a70196dc54797e7cf44761e4967b8c1f40ebdd19..e79b0f2567fb8645e7f52fa94e77d142618df737 100644 (file)
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- created permissions should be based on the TRK template -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="admin"/>
-  <group_roles id="5" group_id="100" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="100" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="4"
+               group_id="101"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="5"
+               group_id="100"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="6"
+               group_id="100"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="7"
+               group_id="[null]"
+               resource_id="123"
+               role="codeviewer"/>
 
-  <user_roles id="2" user_id="200" resource_id="123" role="codeviewer"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="codeviewer"/>
 
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default"/>
+  <permission_templates id="1"
+                        name="default"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
 
   <!-- default permission template for TRK -->
-  <permission_templates id="2" name="default_for_TRK"/>
+  <permission_templates id="2"
+                        name="default_for_TRK"/>
 
-  <perm_templates_groups id="6" template_id="2" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="7" template_id="2" group_id="101" permission_reference="admin"/>
-  <perm_templates_groups id="8" template_id="2" group_id="100" permission_reference="user"/>
-  <perm_templates_groups id="9" template_id="2" group_id="100" permission_reference="codeviewer"/>
-  <perm_templates_groups id="10" template_id="2" group_id="[null]" permission_reference="codeviewer"/>
+  <perm_templates_groups id="6"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="7"
+                         template_id="2"
+                         group_id="101"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="8"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="user"/>
+  <perm_templates_groups id="9"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="10"
+                         template_id="2"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
-  <perm_templates_users id="1" template_id="2" user_id="200" permission_reference="codeviewer"/>
+  <perm_templates_users id="1"
+                        template_id="2"
+                        user_id="200"
+                        permission_reference="codeviewer"/>
 
 </dataset>
index 3b60c1c78d4cc2d00efea7f265e6ff8dd8862a4e..1cd2d2c0544e68a6908cf9e6e5dda8ac23337ede 100644 (file)
@@ -1,35 +1,89 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
 
   <!-- default permission template for TRK -->
-  <permission_templates id="2" name="default_for_TRK" kee="default_for_trk_20130101_010203"/>
+  <permission_templates id="2"
+                        name="default_for_TRK"
+                        kee="default_for_trk_20130101_010203"/>
 
-  <perm_templates_groups id="6" template_id="2" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="7" template_id="2" group_id="101" permission_reference="admin"/>
-  <perm_templates_groups id="8" template_id="2" group_id="100" permission_reference="user"/>
-  <perm_templates_groups id="9" template_id="2" group_id="100" permission_reference="codeviewer"/>
-  <perm_templates_groups id="10" template_id="2" group_id="[null]" permission_reference="codeviewer"/>
+  <perm_templates_groups id="6"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="7"
+                         template_id="2"
+                         group_id="101"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="8"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="user"/>
+  <perm_templates_groups id="9"
+                         template_id="2"
+                         group_id="100"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="10"
+                         template_id="2"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
 
-  <perm_templates_users id="1" template_id="2" user_id="200" permission_reference="codeviewer"/>
+  <perm_templates_users id="1"
+                        template_id="2"
+                        user_id="200"
+                        permission_reference="codeviewer"/>
 
 </dataset>
index 25fdc99252c562d2d7314f6192302448cefda27a..231a7cdd71a42336dc5dcc8a154bb16c22614b97 100644 (file)
@@ -1,30 +1,72 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <groups id="102" name="sonar-foos"/>
-  <groups id="103" name="sonar-bars"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <groups id="102"
+          name="sonar-foos"/>
+  <groups id="103"
+          name="sonar-bars"/>
 
-  <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/>
-  <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/>
+  <users id="200"
+         login="foo"
+         name="Foo"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="bar"
+         name="Bar"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default"
+                        key_pattern="[null]"/>
 
-  <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/>
-  <permission_templates id="3" name="Start with foo again" kee="foo2_tmpl" key_pattern="foo.*"/>
+  <permission_templates id="2"
+                        name="Start with foo"
+                        kee="foo_tmpl"
+                        key_pattern="foo\..*"/>
+  <permission_templates id="3"
+                        name="Start with foo again"
+                        kee="foo2_tmpl"
+                        key_pattern="foo.*"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
 
-  <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/>
+  <perm_templates_groups id="2"
+                         template_id="2"
+                         group_id="102"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="3"
+                         group_id="103"
+                         permission_reference="user"/>
 
   <perm_templates_users/>
 
index ea9b6e062fc6f9f4713b67a1c54c1bad135f89a0..fa6f0be4f659457ce38c96aa53b4be4d9609ac20 100644 (file)
@@ -1,20 +1,45 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- new rows : sonar-administrators (admin) -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
 
   <!-- default permission template -->
-  <permission_templates id="1" name="default_template" kee="default_template_20130101_010203"/>
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
+  <permission_templates id="1"
+                        name="default_template"
+                        kee="default_template_20130101_010203"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
 
 </dataset>
index d1b61aa180c3cf979a86d77629019b807c660455..0f911d4976e2406064646a184dba87346ec38954 100644 (file)
@@ -1,19 +1,44 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- default permission template for TRK -->
-  <permission_templates id="1" name="default_template" kee="default_template_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default_template"
+                        kee="default_template_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="999" permission_reference="admin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="999"
+                         permission_reference="admin"/>
 
 </dataset>
index 319040d44b5f82b04b8d0e7a8727874d95fbd12e..eb800a9f517874b5a10e2241e56338a0b98ecf4b 100644 (file)
@@ -1,23 +1,56 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="disabled"
+         name="Disabled"
+         email="[null]"
+         active="[false]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- new row : marius (admin) -->
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="admin"/>
 
   <!-- default permission template for TRK -->
-  <permission_templates id="1" name="default_for_TRK" kee="default_for_trk_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default_for_TRK"
+                        kee="default_for_trk_20130101_010203"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/>
-  <perm_templates_users id="2" template_id="1" user_id="201" permission_reference="admin"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="200"
+                        permission_reference="admin"/>
+  <perm_templates_users id="2"
+                        template_id="1"
+                        user_id="201"
+                        permission_reference="admin"/>
 
 </dataset>
index 72a71613609746131acef72fc0e8eb7b58444d35..c56ed11a53301852d0626f80ac332de80bf683b8 100644 (file)
@@ -1,20 +1,50 @@
 <dataset>
-  <projects id="123" kee="foo.project"/>
+  <projects id="123"
+            kee="foo.project"/>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-  <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="disabled"
+         name="Disabled"
+         email="[null]"
+         active="[false]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- default permission template for TRK -->
-  <permission_templates id="1" name="default_for_TRK" kee="default_for_trk_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default_for_TRK"
+                        kee="default_for_trk_20130101_010203"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/>
-  <perm_templates_users id="2" template_id="1" user_id="201" permission_reference="admin"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="200"
+                        permission_reference="admin"/>
+  <perm_templates_users id="2"
+                        template_id="1"
+                        user_id="201"
+                        permission_reference="admin"/>
 
 </dataset>
index 7f154cd1915c1843b23ec9b617d421bff8cca093..0710211a20571abb9810efa0f455631294ce31e4 100644 (file)
@@ -1,6 +1,13 @@
 <dataset>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
-  <user_roles user_id="200" resource_id="123" role="admin"/>
+  <user_roles user_id="200"
+              resource_id="123"
+              role="admin"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index 24349836265593b753f2567c13957888488245c3..9b2062063eec8d4e4eaa63280f9b01d63398e0c9 100644 (file)
@@ -1,3 +1,8 @@
 <dataset>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 </dataset>
index 3d5f9a5ecf2dbc637dbe52046949b48989d953c9..a24d8cb4f1ecfce2a6df44bccf8ed4e0c5e00a7f 100644 (file)
@@ -1,16 +1,35 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- only_users -->
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- only_groups -->
-  <group_roles id="1" group_id="100" resource_id="2" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="2"
+               role="admin"/>
 
   <!-- groups_and_users -->
-  <group_roles id="2" group_id="101" resource_id="3" role="user"/>
-  <user_roles id="2" user_id="200" resource_id="3" role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="3"
+               role="user"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="3"
+              role="admin"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index c348e3daa47851c958ff5df0a549981a8cb7258a..ef64957570ff2b2e5b8745c9c2add229ae7ad212 100644 (file)
@@ -1,50 +1,56 @@
 <dataset>
 
-  <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi"
-         created_at="1418215735482" updated_at="1418215735482" active="[true]"/>
+  <users id="42"
+         login="obiwan"
+         name="Obiwan"
+         email="obiwan@keno.bi"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
 
   <dashboards
-    id="1"
-    user_id="1"
-    name="My Dashboard"
-    description="Dashboard shared by admin"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="1"
+      user_id="1"
+      name="My Dashboard"
+      description="Dashboard shared by admin"
+      column_layout="100%"
+      shared="[true]"
+  />
   <dashboards
-    id="2"
-    user_id="[null]"
-    name="Default Dashboard"
-    description="Dashboard provided by system"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="2"
+      user_id="[null]"
+      name="Default Dashboard"
+      description="Dashboard provided by system"
+      column_layout="100%"
+      shared="[true]"
+  />
   <dashboards
-    id="4"
-    user_id="[null]"
-    name="User Dashboard"
-    description="Won't appear, not anonymous"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="4"
+      user_id="[null]"
+      name="User Dashboard"
+      description="Won't appear, not anonymous"
+      column_layout="100%"
+      shared="[true]"
+  />
 
   <!-- Dashboard with ID 1 appears after ID 2 -->
   <active_dashboards
-    id="1"
-    dashboard_id="1"
-    user_id="[null]"
-    order_index="2"/>
+      id="1"
+      dashboard_id="1"
+      user_id="[null]"
+      order_index="2"/>
   <!-- Dashboard with ID 2 appears before ID 1 -->
   <active_dashboards
-    id="2"
-    dashboard_id="2"
-    user_id="[null]"
-    order_index="1"/>
+      id="2"
+      dashboard_id="2"
+      user_id="[null]"
+      order_index="1"/>
   <!-- Dashboard with ID 4 does not appear (not anonymous) -->
   <active_dashboards
-    id="4"
-    dashboard_id="4"
-    user_id="42"
-    order_index="1"/>
+      id="4"
+      dashboard_id="4"
+      user_id="42"
+      order_index="1"/>
 
 </dataset>
index 12889562e42dad7d611c147ed347fc4ccc9938bd..5b57ddfa5d55a318721b3c48a54433ffa003b964 100644 (file)
@@ -1,66 +1,78 @@
 <dataset>
 
-  <users id="24" login="anakin" name="Anakin" email="anakin@skywalk.er"
-         created_at="1418215735482" updated_at="1418215735482" active="[true]"/>
-  <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi"
-         created_at="1418215735482" updated_at="1418215735482" active="[true]"/>
+  <users id="24"
+         login="anakin"
+         name="Anakin"
+         email="anakin@skywalk.er"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="42"
+         login="obiwan"
+         name="Obiwan"
+         email="obiwan@keno.bi"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
 
   <dashboards
-    id="1"
-    user_id="1"
-    name="My Dashboard"
-    description="Dashboard shared by admin"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="1"
+      user_id="1"
+      name="My Dashboard"
+      description="Dashboard shared by admin"
+      column_layout="100%"
+      shared="[true]"
+  />
   <dashboards
-    id="2"
-    user_id="[null]"
-    name="Default Dashboard"
-    description="Dashboard provided by system"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="2"
+      user_id="[null]"
+      name="Default Dashboard"
+      description="Dashboard provided by system"
+      column_layout="100%"
+      shared="[true]"
+  />
   <dashboards
-    id="4"
-    user_id="[null]"
-    name="Anonymous Dashboard"
-    description="Won't appear, anonymous"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="4"
+      user_id="[null]"
+      name="Anonymous Dashboard"
+      description="Won't appear, anonymous"
+      column_layout="100%"
+      shared="[true]"
+  />
   <dashboards
-    id="5"
-    user_id="[null]"
-    name="Another User Dashboard"
-    description="Won't appear, different user"
-    column_layout="100%"
-    shared="[true]"
-    />
+      id="5"
+      user_id="[null]"
+      name="Another User Dashboard"
+      description="Won't appear, different user"
+      column_layout="100%"
+      shared="[true]"
+  />
 
   <!-- Dashboard with ID 1 appears after ID 2 -->
   <active_dashboards
-    id="1"
-    dashboard_id="1"
-    user_id="42"
-    order_index="2"/>
+      id="1"
+      dashboard_id="1"
+      user_id="42"
+      order_index="2"/>
   <!-- Dashboard with ID 2 appears before ID 1 -->
   <active_dashboards
-    id="2"
-    dashboard_id="2"
-    user_id="42"
-    order_index="1"/>
+      id="2"
+      dashboard_id="2"
+      user_id="42"
+      order_index="1"/>
   <!-- Dashboard with ID 4 does not appear (anonymous) -->
   <active_dashboards
-    id="4"
-    dashboard_id="4"
-    user_id="[null]"
-    order_index="1"/>
+      id="4"
+      dashboard_id="4"
+      user_id="[null]"
+      order_index="1"/>
   <!-- Dashboard with ID 5 does not appear (another user) -->
   <active_dashboards
-    id="5"
-    dashboard_id="5"
-    user_id="24"
-    order_index="1"/>
+      id="5"
+      dashboard_id="5"
+      user_id="24"
+      order_index="1"/>
 
 </dataset>
index bd166a7e669529da7d0d497a35b20cf25d856266..0162bcc8eedfb5dd6abd75cf86c04f7190187756 100644 (file)
@@ -1,11 +1,20 @@
 <dataset>
 
-  <users id="10" login="anyone_user"/>
+  <users id="10"
+         login="anyone_user"
+         is_root="[false]"/>
 
-  <user_roles id="1" user_id="10" resource_id="[null]" role="user"/>
+  <user_roles id="1"
+              user_id="10"
+              resource_id="[null]"
+              role="user"/>
 
-  <groups_users user_id="10" group_id="[null]"/>
+  <groups_users user_id="10"
+                group_id="[null]"/>
 
-  <group_roles id="1" group_id="[null]" resource_id="[null]" role="profileadmin"/>
+  <group_roles id="1"
+               group_id="[null]"
+               resource_id="[null]"
+               role="profileadmin"/>
 
 </dataset>
index 0ff49e9417c399b934d531c6007f1d81b5a5c4b1..3c277449e2c092a8e42ce44c85b17c765fd64a62 100644 (file)
@@ -1,18 +1,37 @@
 <dataset>
 
   <!-- user 10 has no direct grant access, but is in the 'user' group 200 and in the 'admin' group 201 -->
-  <users id="10" login="john"/>
+  <users id="10"
+         login="john"
+         is_root="[false]"/>
   <!-- user 11 has no direct grant access, but is in the 'user' group 200 -->
-  <users id="11" login="arthur"/>
+  <users id="11"
+         login="arthur"
+         is_root="[false]"/>
 
-  <user_roles id="1" user_id="999" resource_id="[null]" role="user"/>
-  <user_roles id="2" user_id="999" resource_id="[null]" role="user"/>
+  <user_roles id="1"
+              user_id="999"
+              resource_id="[null]"
+              role="user"/>
+  <user_roles id="2"
+              user_id="999"
+              resource_id="[null]"
+              role="user"/>
 
-  <groups_users user_id="10" group_id="200"/>
-  <groups_users user_id="10" group_id="201"/>
-  <groups_users user_id="11" group_id="200"/>
+  <groups_users user_id="10"
+                group_id="200"/>
+  <groups_users user_id="10"
+                group_id="201"/>
+  <groups_users user_id="11"
+                group_id="200"/>
 
-  <group_roles id="1" group_id="200" resource_id="[null]" role="user"/>
-  <group_roles id="2" group_id="201" resource_id="[null]" role="admin"/>
+  <group_roles id="1"
+               group_id="200"
+               resource_id="[null]"
+               role="user"/>
+  <group_roles id="2"
+               group_id="201"
+               resource_id="[null]"
+               role="admin"/>
 
 </dataset>
index 5b8e83ba208b13b3f2791173b7dc54384bc70e18..53dcd98975ddd0d1e2275938d1d64dcefd0d4cf7 100644 (file)
@@ -1,18 +1,39 @@
 <dataset>
 
   <!-- user 10 has no group, but has direct role 'user' and 'admin' -->
-  <users id="10" login="john"/>
+  <users id="10"
+         login="john"
+         is_root="[false]"/>
   <!-- user 11 has no group, but has direct role 'user' -->
-  <users id="11" login="arthur"/>
+  <users id="11"
+         login="arthur"
+         is_root="[false]"/>
 
-  <user_roles id="1" user_id="10" resource_id="[null]" role="user"/>
-  <user_roles id="2" user_id="10" resource_id="[null]" role="admin"/>
-  <user_roles id="3" user_id="11" resource_id="[null]" role="user"/>
+  <user_roles id="1"
+              user_id="10"
+              resource_id="[null]"
+              role="user"/>
+  <user_roles id="2"
+              user_id="10"
+              resource_id="[null]"
+              role="admin"/>
+  <user_roles id="3"
+              user_id="11"
+              resource_id="[null]"
+              role="user"/>
 
-  <groups_users user_id="999" group_id="200"/>
-  <groups_users user_id="999" group_id="201"/>
+  <groups_users user_id="999"
+                group_id="200"/>
+  <groups_users user_id="999"
+                group_id="201"/>
 
-  <group_roles id="200" group_id="200" resource_id="[null]" role="user"/>
-  <group_roles id="201" group_id="200" resource_id="[null]" role="admin"/>
+  <group_roles id="200"
+               group_id="200"
+               resource_id="[null]"
+               role="user"/>
+  <group_roles id="201"
+               group_id="200"
+               resource_id="[null]"
+               role="admin"/>
 
 </dataset>
index 617ffffe38e4fb511ba97f9ecbbd8aa5a3bfc958..0c945ecfc5da8e64ac890b02d5eee78358fdd7d5 100644 (file)
 <dataset>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
 
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-  <users id="201" login="janette" name="Janette" email="[null]" active="[true]"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="janette"
+         name="Janette"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
-  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
-  <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="4"
+               group_id="101"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="5"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="6"
+               group_id="101"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="7"
+               group_id="[null]"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="8"
+               group_id="100"
+               resource_id="123"
+               role="issueadmin"/>
 
   <!-- new user permission : marius (admin) & janette (user) -->
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
-  <user_roles id="3" user_id="201" resource_id="123" role="admin"/>
-  <user_roles id="4" user_id="201" resource_id="123" role="user"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="admin"/>
+  <user_roles id="3"
+              user_id="201"
+              resource_id="123"
+              role="admin"/>
+  <user_roles id="4"
+              user_id="201"
+              resource_id="123"
+              role="user"/>
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
-  <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="6"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="issueadmin"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="200"
+                        permission_reference="admin"/>
 
 </dataset>
index f73214a0ce675d89094b19079774630b585ca6a6..69ef3dc8a0ab7d0151afdab477416465d7691a49 100644 (file)
          login="marius"
          name="Marius"
          email="[null]"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
   <users id="201"
          login="janette"
          name="Janette"
          email="[null]"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
   <group_roles id="1"
index 3eeec0d08bf0a2d0e48b9fbefbdeaee16e87f87c..14f030dfe78b6a628fa7f25d50a84ad8dac3825f 100644 (file)
 <dataset>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
 
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-  <users id="201" login="janette" name="Janette" email="[null]" active="[true]"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="janette"
+         name="Janette"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
-  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
-  <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="4"
+               group_id="101"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="5"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="6"
+               group_id="101"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="7"
+               group_id="[null]"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="8"
+               group_id="100"
+               resource_id="123"
+               role="issueadmin"/>
 
   <!-- new user permission : marius (admin) & janette (user) -->
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="admin"/>
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
-  <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="6"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="issueadmin"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="200"
+                        permission_reference="admin"/>
 
 </dataset>
index ebbe1126bfd1b92855b9e6be3943fa4b70bc2699..fbb7723c0b9e1a6b8af269d3a331d04d14e83e4f 100644 (file)
@@ -25,7 +25,8 @@
          login="marius"
          name="Marius"
          email="[null]"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
   <group_roles id="1"
index 242b2056066c974964ddc849cc34862b4e2dd7aa..893a26c346e73b0af5086e5fdca57420b308ae75 100644 (file)
@@ -1,13 +1,34 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <user_roles id="1" user_id="200" resource_id="123" role="user"/>
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="user"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="admin"/>
 
-  <projects id="100" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
-            description="the description" long_name="Apache Struts"
-            enabled="[true]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" path="[null]"
+  <projects id="100"
+            root_id="[null]"
+            scope="PRJ"
+            qualifier="TRK"
+            kee="org.struts:struts"
+            name="Struts"
+            description="the description"
+            long_name="Apache Struts"
+            enabled="[true]"
+            language="java"
+            copy_component_uuid="[null]"
+            developer_uuid="[null]"
+            path="[null]"
             authorization_updated_at="123456789"/>
 
 </dataset>
index e2b447b00642bb288fde832b767e4ae3d410e7b9..d05c847f70ff95f5151dc5e7cc9a2557e9e55dc4 100644 (file)
@@ -4,7 +4,8 @@
          login="dave.loper"
          name="Dave Loper"
          email="dave.loper@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <user_roles id="1"
               user_id="200"
index b70b4ac31a0772dde2a4b3febfb915364985cc98..0bfd094f5e9a3212d084f897a5e9f201dd5c6c71 100644 (file)
@@ -1,36 +1,96 @@
 <dataset>
 
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
 
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
-  <group_roles id="1" group_id="100" resource_id="1" role="admin"/>
-  <group_roles id="2" group_id="101" resource_id="1" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="1" role="admin"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="1"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="101"
+               resource_id="1"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="1"
+              role="admin"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
-  <group_roles id="3" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="4" group_id="101" resource_id="123" role="user"/>
-  <group_roles id="5" group_id="[null]" resource_id="123" role="user"/>
-  <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/>
-  <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/>
-  <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/>
+  <group_roles id="3"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="4"
+               group_id="101"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="5"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <group_roles id="6"
+               group_id="101"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="7"
+               group_id="[null]"
+               resource_id="123"
+               role="codeviewer"/>
+  <group_roles id="8"
+               group_id="100"
+               resource_id="123"
+               role="issueadmin"/>
 
   <!-- new user permission : marius (admin) -->
-  <user_roles id="2" user_id="200" resource_id="123" role="admin"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="123"
+              role="admin"/>
 
   <!-- default permission template for all qualifiers -->
-  <permission_templates id="1" name="default" kee="default_20130101_010203"/>
+  <permission_templates id="1"
+                        name="default"
+                        kee="default_20130101_010203"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/>
-  <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/>
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/>
-  <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/>
-  <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/>
-  <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="admin"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="user"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="user"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="101"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="5"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="codeviewer"/>
+  <perm_templates_groups id="6"
+                         template_id="1"
+                         group_id="100"
+                         permission_reference="issueadmin"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="200"
+                        permission_reference="admin"/>
 
 </dataset>
index d8dd2c0fbed053b9d08d7ee6421dc5c05a86a692..49d49e682dfb5efb9b6bd1e0e9ed6415ba48b1a1 100644 (file)
@@ -26,7 +26,8 @@
          login="marius"
          name="Marius"
          email="[null]"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <!-- on other resources -->
   <group_roles id="1"
index aea672478c675c974698004d57c5dcc6d8cf3bce..87111255fcc595a601ed2d387c12c4c81a6ec8be 100644 (file)
@@ -1,11 +1,23 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
-  <user_roles id="1" user_id="200" resource_id="123" role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="user"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index e2b447b00642bb288fde832b767e4ae3d410e7b9..d05c847f70ff95f5151dc5e7cc9a2557e9e55dc4 100644 (file)
@@ -4,7 +4,8 @@
          login="dave.loper"
          name="Dave Loper"
          email="dave.loper@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <user_roles id="1"
               user_id="200"
index c6386d5c4cf37f5862312211779b00d23880d118..4cdf709a435609b83bf25975a69462ff61bee7db 100644 (file)
@@ -4,7 +4,8 @@
          login="dave.loper"
          name="Dave Loper"
          email="dave.loper@company.net"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
   <user_roles id="1"
               user_id="200"
index 38def462ed1d73a25efd21b5957a58de92a67bd2..5b08aed9395acd7d805a9cef0b6d10008f243744 100644 (file)
@@ -1,11 +1,17 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
   <user_roles/>
 
   <group_roles/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index aea672478c675c974698004d57c5dcc6d8cf3bce..87111255fcc595a601ed2d387c12c4c81a6ec8be 100644 (file)
@@ -1,11 +1,23 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
-  <user_roles id="1" user_id="200" resource_id="123" role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="user"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index ab25dd4019264e666079d49a9dd7bd464e7a4d83..d6c387efb804f446e8c94d0d8f5f0c1677ce346e 100644 (file)
@@ -1,10 +1,22 @@
 <dataset>
-  <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description"
-                        created_at="[null]" updated_at="[null]"/>
+  <permission_templates id="1"
+                        name="my template"
+                        kee="my_template_20130102_030405"
+                        description="my description"
+                        created_at="[null]"
+                        updated_at="[null]"/>
 
-  <users id="1" login="user1" name="user1"/>
-  <users id="2" login="user2" name="user2"/>
+  <users id="1"
+         login="user1"
+         name="user1"
+         is_root="[false]"/>
+  <users id="2"
+         login="user2"
+         name="user2"
+         is_root="[false]"/>
 
-  <groups id="1" name="group1"/>
-  <groups id="2" name="group2"/>
+  <groups id="1"
+          name="group1"/>
+  <groups id="2"
+          name="group2"/>
 </dataset>
index 2c82c31400e74dc7af36efa62868f694b721946c..c3301093db97bb481acd179ddc52e39e10551eb6 100644 (file)
@@ -1,21 +1,54 @@
 <dataset>
-  <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description"
-                        created_at="[null]" updated_at="[null]"/>
+  <permission_templates id="1"
+                        name="my template"
+                        kee="my_template_20130102_030405"
+                        description="my description"
+                        created_at="[null]"
+                        updated_at="[null]"/>
 
-  <perm_templates_users id="1" template_id="1" user_id="1" permission_reference="user_permission1"/>
-  <perm_templates_users id="2" template_id="1" user_id="2" permission_reference="user_permission1"/>
-  <perm_templates_users id="3" template_id="1" user_id="2" permission_reference="user_permission2"/>
+  <perm_templates_users id="1"
+                        template_id="1"
+                        user_id="1"
+                        permission_reference="user_permission1"/>
+  <perm_templates_users id="2"
+                        template_id="1"
+                        user_id="2"
+                        permission_reference="user_permission1"/>
+  <perm_templates_users id="3"
+                        template_id="1"
+                        user_id="2"
+                        permission_reference="user_permission2"/>
 
-  <users id="1" login="login1" name="user1"/>
-  <users id="2" login="login2" name="user2"/>
+  <users id="1"
+         login="login1"
+         name="user1"
+         is_root="[false]"/>
+  <users id="2"
+         login="login2"
+         name="user2"
+         is_root="[false]"/>
 
-  <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="group_permission1"/>
-  <perm_templates_groups id="2" template_id="1" group_id="2" permission_reference="group_permission1"/>
+  <perm_templates_groups id="1"
+                         template_id="1"
+                         group_id="1"
+                         permission_reference="group_permission1"/>
+  <perm_templates_groups id="2"
+                         template_id="1"
+                         group_id="2"
+                         permission_reference="group_permission1"/>
   <!-- Anyone group -->
-  <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="group_permission2"/>
+  <perm_templates_groups id="3"
+                         template_id="1"
+                         group_id="[null]"
+                         permission_reference="group_permission2"/>
   <!-- Unmatched group -->
-  <perm_templates_groups id="4" template_id="1" group_id="999999" permission_reference="group_permission2"/>
+  <perm_templates_groups id="4"
+                         template_id="1"
+                         group_id="999999"
+                         permission_reference="group_permission2"/>
 
-  <groups id="1" name="group1"/>
-  <groups id="2" name="group2"/>
+  <groups id="1"
+          name="group1"/>
+  <groups id="2"
+          name="group2"/>
 </dataset>
index 14833919475815ca2d8d7989797a5c0e981f7727..07574c24e027936d7a51710cc136463775002001 100644 (file)
@@ -1,14 +1,42 @@
 <dataset>
 
-  <users id="200" login="user1" name="User1" active="[true]"/>
-  <users id="201" login="user2" name="User2" active="[true]"/>
-  <users id="202" login="user3" name="User3" active="[true]"/>
-  <users id="999" login="disabledUser" name="disabledUser" active="[false]"/>
+  <users id="200"
+         login="user1"
+         name="User1"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="user2"
+         name="User2"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="202"
+         login="user3"
+         name="User3"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="999"
+         login="disabledUser"
+         name="disabledUser"
+         active="[false]"
+         is_root="[false]"/>
 
-  <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/>
-  <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/>
-  <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/>
+  <perm_templates_users id="1"
+                        user_id="200"
+                        permission_reference="user"
+                        template_id="50"/>
+  <perm_templates_users id="2"
+                        user_id="200"
+                        permission_reference="admin"
+                        template_id="50"/>
+  <perm_templates_users id="3"
+                        user_id="200"
+                        permission_reference="codeviewer"
+                        template_id="50"/>
 
-  <perm_templates_users id="4" user_id="201" permission_reference="user" template_id="50"/>
+  <perm_templates_users id="4"
+                        user_id="201"
+                        permission_reference="user"
+                        template_id="50"/>
 
 </dataset>
index 6670f5ca21cb520727e01b1e6fc937811375b9ea..528d308bd52d8db35c05d65061770c27f295a896 100644 (file)
@@ -1,14 +1,41 @@
 <dataset>
 
-  <users id="200" login="user1" name="User1" active="[true]"/>
-  <users id="201" login="user2" name="User2" active="[true]"/>
-  <users id="202" login="user3" name="User3" active="[true]"/>
+  <users id="200"
+         login="user1"
+         name="User1"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="user2"
+         name="User2"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="202"
+         login="user3"
+         name="User3"
+         active="[true]"
+         is_root="[false]"/>
 
-  <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/>
-  <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/>
-  <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/>
-  <perm_templates_users id="4" user_id="200" permission_reference="user" template_id="51"/>
+  <perm_templates_users id="1"
+                        user_id="200"
+                        permission_reference="user"
+                        template_id="50"/>
+  <perm_templates_users id="2"
+                        user_id="200"
+                        permission_reference="admin"
+                        template_id="50"/>
+  <perm_templates_users id="3"
+                        user_id="200"
+                        permission_reference="codeviewer"
+                        template_id="50"/>
+  <perm_templates_users id="4"
+                        user_id="200"
+                        permission_reference="user"
+                        template_id="51"/>
 
-  <perm_templates_users id="5" user_id="201" permission_reference="user" template_id="50"/>
+  <perm_templates_users id="5"
+                        user_id="201"
+                        permission_reference="user"
+                        template_id="50"/>
 
 </dataset>
index fd8b981c203cf34aa0696cc7d8ed9b8908c5d4ed..ba0200052371854a542c0d4e130103038d377b65 100644 (file)
@@ -1,13 +1,37 @@
 <dataset>
 
-  <users id="200" login="user3" name="User3" active="[true]"/>
-  <users id="201" login="user1" name="User1" active="[true]"/>
-  <users id="202" login="user2" name="User2" active="[true]"/>
+  <users id="200"
+         login="user3"
+         name="User3"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="user1"
+         name="User1"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="202"
+         login="user2"
+         name="User2"
+         active="[true]"
+         is_root="[false]"/>
 
-  <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/>
-  <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/>
-  <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/>
+  <perm_templates_users id="1"
+                        user_id="200"
+                        permission_reference="user"
+                        template_id="50"/>
+  <perm_templates_users id="2"
+                        user_id="200"
+                        permission_reference="admin"
+                        template_id="50"/>
+  <perm_templates_users id="3"
+                        user_id="200"
+                        permission_reference="codeviewer"
+                        template_id="50"/>
 
-  <perm_templates_users id="4" user_id="201" permission_reference="user" template_id="50"/>
+  <perm_templates_users id="4"
+                        user_id="201"
+                        permission_reference="user"
+                        template_id="50"/>
 
 </dataset>
index da498e192bd0b47b18f75d1b980e6a338045a0d4..a7dda4cf7892d40d904cb129d767b0331e106d75 100644 (file)
@@ -1,12 +1,33 @@
 <dataset>
 
-  <groups id="1" name="sonar-users" description="Sonar Users" created_at="2014-09-07" updated_at="2014-09-08"/>
-  <groups id="2" name="sonar-admins" description="Sonar Admins" created_at="2014-09-07" updated_at="2014-09-08"/>
-  <groups id="3" name="sonar-reviewers" description="Sonar Reviewers" created_at="2014-09-07" updated_at="2014-09-08"/>
+  <groups id="1"
+          name="sonar-users"
+          description="Sonar Users"
+          created_at="2014-09-07"
+          updated_at="2014-09-08"/>
+  <groups id="2"
+          name="sonar-admins"
+          description="Sonar Admins"
+          created_at="2014-09-07"
+          updated_at="2014-09-08"/>
+  <groups id="3"
+          name="sonar-reviewers"
+          description="Sonar Reviewers"
+          created_at="2014-09-07"
+          updated_at="2014-09-08"/>
 
-  <groups_users user_id="100" group_id="1"/>
-  <groups_users user_id="100" group_id="2"/>
+  <groups_users user_id="100"
+                group_id="1"/>
+  <groups_users user_id="100"
+                group_id="2"/>
 
-  <users id="100" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" active="[true]"/>
+  <users id="100"
+         login="john"
+         name="John"
+         email="jo@hn.com"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
index a882f396f6c7e868c0cf0293922067856fa93052..8ce3b02d6463a87b6a7b62757dbb53383c190f94 100644 (file)
@@ -1,19 +1,35 @@
 <dataset>
 
-  <groups id="100" name="sonar-administrators" description="System administrators"/>
-  <groups id="101" name="sonar-users" description="Any new users created will automatically join this group"/>
-  <groups id="102" name="sonar-reviewers" description="Reviewers"/>
+  <groups id="100"
+          name="sonar-administrators"
+          description="System administrators"/>
+  <groups id="101"
+          name="sonar-users"
+          description="Any new users created will automatically join this group"/>
+  <groups id="102"
+          name="sonar-reviewers"
+          description="Reviewers"/>
 
   <!-- user 200 is in all groups -->
-  <groups_users user_id="200" group_id="100"/>
-  <groups_users user_id="200" group_id="101"/>
-  <groups_users user_id="200" group_id="102"/>
+  <groups_users user_id="200"
+                group_id="100"/>
+  <groups_users user_id="200"
+                group_id="101"/>
+  <groups_users user_id="200"
+                group_id="102"/>
 
   <!-- user 201 is in users group -->
-  <groups_users user_id="201" group_id="101"/>
+  <groups_users user_id="201"
+                group_id="101"/>
 
-  <users id="200" login="two-hundred"/>
-  <users id="201" login="two-hundred-one"/>
-  <users id="202" login="two-hundred-two"/>
+  <users id="200"
+         login="two-hundred"
+         is_root="[false]"/>
+  <users id="201"
+         login="two-hundred-one"
+         is_root="[false]"/>
+  <users id="202"
+         login="two-hundred-two"
+         is_root="[false]"/>
 
 </dataset>
index 36b892243269ef29e6c963a4f2269d7f6fdcac01..83007bbe7705f9acb9c45511036f85461fb5df80 100644 (file)
@@ -1,20 +1,44 @@
 <dataset>
 
-  <groups id="100" name="sonar-administrators" description="System administrators"/>
-  <groups id="101" name="sonar-users" description="Any new users created will automatically join this group"/>
-  <groups id="102" name="sonar-reviewers" description="Reviewers"/>
-  <groups id="103" name="sonar-nobody" description="Nobody in this group"/>
+  <groups id="100"
+          name="sonar-administrators"
+          description="System administrators"/>
+  <groups id="101"
+          name="sonar-users"
+          description="Any new users created will automatically join this group"/>
+  <groups id="102"
+          name="sonar-reviewers"
+          description="Reviewers"/>
+  <groups id="103"
+          name="sonar-nobody"
+          description="Nobody in this group"/>
 
   <!-- user 200 is in all groups -->
-  <groups_users user_id="200" group_id="100"/>
-  <groups_users user_id="200" group_id="101"/>
-  <groups_users user_id="200" group_id="102"/>
+  <groups_users user_id="200"
+                group_id="100"/>
+  <groups_users user_id="200"
+                group_id="101"/>
+  <groups_users user_id="200"
+                group_id="102"/>
 
   <!-- user 201 is in users group -->
-  <groups_users user_id="201" group_id="101"/>
+  <groups_users user_id="201"
+                group_id="101"/>
 
-  <users id="200" login="admin" name="Admin" active="[true]"/>
-  <users id="201" login="not.admin" name="Not Admin" active="[true]"/>
-  <users id="202" login="inactive" name="Inactive" active="[false]"/>
+  <users id="200"
+         login="admin"
+         name="Admin"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="201"
+         login="not.admin"
+         name="Not Admin"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="202"
+         login="inactive"
+         name="Inactive"
+         active="[false]"
+         is_root="[false]"/>
 
 </dataset>
index aea672478c675c974698004d57c5dcc6d8cf3bce..87111255fcc595a601ed2d387c12c4c81a6ec8be 100644 (file)
@@ -1,11 +1,23 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
-  <user_roles id="1" user_id="200" resource_id="123" role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="user"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index 38def462ed1d73a25efd21b5957a58de92a67bd2..5b08aed9395acd7d805a9cef0b6d10008f243744 100644 (file)
@@ -1,11 +1,17 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
   <user_roles/>
 
   <group_roles/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index aea672478c675c974698004d57c5dcc6d8cf3bce..87111255fcc595a601ed2d387c12c4c81a6ec8be 100644 (file)
@@ -1,11 +1,23 @@
 <dataset>
 
-  <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/>
+  <users id="200"
+         login="dave.loper"
+         name="Dave Loper"
+         email="dave.loper@company.net"
+         active="[true]"
+         is_root="[false]"/>
 
-  <groups id="100" name="devs"/>
+  <groups id="100"
+          name="devs"/>
 
-  <user_roles id="1" user_id="200" resource_id="123" role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="user"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index ec1ed3b076f0a0f2a8b50409ce67a0a2935f98b5..6a6ef25983a138c5eea061a79ae4f5671eb68b93 100644 (file)
@@ -1,14 +1,36 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="2" group_id="[null]" resource_id="123" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="codeviewer"/>
 
   <!-- other resource -->
-  <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/>
-  <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/>
+  <group_roles id="3"
+               group_id="101"
+               resource_id="999"
+               role="codeviewer"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="999"
+              role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index dae82ddd8f829b7777c323a7f62b34f98d13f39d..82a63b36e48c568035ddb81b3c55cab1913c44d3 100644 (file)
@@ -1,14 +1,27 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
   <!--<group_roles id="1" group_id="100" resource_id="123" role="admin"/>-->
   <!--<group_roles id="2" group_id="[null]" resource_id="123" role="user"/>-->
   <!--<user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/>-->
 
   <!-- other resource -->
-  <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/>
-  <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/>
+  <group_roles id="3"
+               group_id="101"
+               resource_id="999"
+               role="codeviewer"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="999"
+              role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index ec1ed3b076f0a0f2a8b50409ce67a0a2935f98b5..6a6ef25983a138c5eea061a79ae4f5671eb68b93 100644 (file)
@@ -1,14 +1,36 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="2" group_id="[null]" resource_id="123" role="user"/>
-  <user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
+  <user_roles id="1"
+              user_id="200"
+              resource_id="123"
+              role="codeviewer"/>
 
   <!-- other resource -->
-  <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/>
-  <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/>
+  <group_roles id="3"
+               group_id="101"
+               resource_id="999"
+               role="codeviewer"/>
+  <user_roles id="2"
+              user_id="200"
+              resource_id="999"
+              role="codeviewer"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
index 48a22e188341e0574a938bc5c33210fa42732c29..615725e27d6d05e6db4b2fffbe213add1e118df2 100644 (file)
@@ -1,10 +1,23 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
 
-  <group_roles id="1" group_id="100" resource_id="123" role="admin"/>
-  <group_roles id="2" group_id="[null]" resource_id="123" role="user"/>
+  <group_roles id="1"
+               group_id="100"
+               resource_id="123"
+               role="admin"/>
+  <group_roles id="2"
+               group_id="[null]"
+               resource_id="123"
+               role="user"/>
 
 
 </dataset>
index b99df83bc1577953b664bfabf5000f960566c058..87b54d7b3550b4f4c48821e5e2a10d2bbf6c7eaf 100644 (file)
@@ -1,5 +1,12 @@
 <dataset>
-  <groups id="100" name="sonar-administrators"/>
-  <groups id="101" name="sonar-users"/>
-  <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/>
-</dataset>
\ No newline at end of file
+  <groups id="100"
+          name="sonar-administrators"/>
+  <groups id="101"
+          name="sonar-users"/>
+  <users id="200"
+         login="marius"
+         name="Marius"
+         email="[null]"
+         active="[true]"
+         is_root="[false]"/>
+</dataset>
index 5a54ec22958464439a3d68b5a8a0ffecada707f6..63dd4a57e8dadce83a87c15a4d79fbae4c39975f 100644 (file)
@@ -1,8 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
-  <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
+  <users id="102"
+         login="sbrandhof"
+         name="Simon Brandhof"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="[null]"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"
+         is_root="[false]"/>
 
 </dataset>
index 621e018f88b204b8e2dd335a3774bb933bdc2311..a15c10259bcd463abfd074e6b360ff26277e27f4 100644 (file)
@@ -1,4 +1,10 @@
 <dataset>
-  <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482"
-         active="[true]"/>
+  <users id="1"
+         login="john"
+         name="John"
+         email="jo@hn.com"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
 </dataset>
index dc029ad46d6234475ab461257ce755f118bb5631..aa0b64fadf2d10be3d4ff0a18f4aa596d5ee031f 100644 (file)
@@ -1,14 +1,32 @@
 <dataset>
   <!-- inactive -->
-  <users id="50" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[false]"/>
+  <users id="50"
+         login="inactive_user"
+         name="Disabled"
+         email="inactive@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[false]"
+         is_root="[false]"/>
 
   <!-- active -->
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
-  <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="102"
+         login="jcdus"
+         name="Jean-Claude Dus"
+         email="jcdus@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
 
 </dataset>
index 3be84a27b696bfd1d3ce39073da8b95940097e6d..65e155941df61cbf379b1073ea394cb55e51525e 100644 (file)
@@ -1,9 +1,27 @@
 <dataset>
-  <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[false]"/>
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
-  <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="100"
+         login="inactive_user"
+         name="Disabled"
+         email="inactive@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[false]"
+         is_root="[false]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="102"
+         login="jcdus"
+         name="Jean-Claude Dus"
+         email="jcdus@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
index 3be84a27b696bfd1d3ce39073da8b95940097e6d..65e155941df61cbf379b1073ea394cb55e51525e 100644 (file)
@@ -1,9 +1,27 @@
 <dataset>
-  <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[false]"/>
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
-  <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="100"
+         login="inactive_user"
+         name="Disabled"
+         email="inactive@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[false]"
+         is_root="[false]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="102"
+         login="jcdus"
+         name="Jean-Claude Dus"
+         email="jcdus@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
index 7107ad4ed36c9a03458204f3807523e000164cdb..8f6bacd7c43476347e60b7d735e1a992215b7d9f 100644 (file)
@@ -1,7 +1,19 @@
 <dataset>
-  <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[false]"/>
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="100"
+         login="inactive_user"
+         name="Disabled"
+         email="inactive@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[false]"
+         is_root="[false]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
index 1c685cc787c26730acbde5aee7658ab3310f47e4..89b1302e298af22fb4301274ecba94a9ecdb7b05 100644 (file)
@@ -1,7 +1,19 @@
 <dataset>
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
-  <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" created_at="1418215735482"
-         updated_at="1418215735485" active="[true]"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
+  <users id="102"
+         login="sbrandhof"
+         name="Simon Brandhof"
+         email="marius@lesbronzes.fr"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
index 5a54ec22958464439a3d68b5a8a0ffecada707f6..d07ecce8728dcbcf957f813813c128545b495d7a 100644 (file)
@@ -1,8 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
-  <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/>
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
+  <users id="102"
+         login="sbrandhof"
+         name="Simon Brandhof"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="[null]"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"
+         is_root="[true]"/>
 
 </dataset>
index 1a5f244b365955565576b7836df2e269b14d41b8..3ded656c9f455addbeeb467c1e78d77fe7331f21 100644 (file)
@@ -1,9 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
-  <users id="102" login="sbrandhof" name="Simon Brandhof" email="sbrandhof@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482"
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         created_at="1418215735482"
          updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/>
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
+  <users id="102"
+         login="sbrandhof"
+         name="Simon Brandhof"
+         email="sbrandhof@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="[null]"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"
+         is_root="[false]"/>
 
 </dataset>
index 41fe9478740f3a53eb0938074d5a313224460933..63dd4a57e8dadce83a87c15a4d79fbae4c39975f 100644 (file)
@@ -1,9 +1,26 @@
 <dataset>
 
-  <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts="&#10;ma&#10;marius33&#10;" created_at="1418215735482" updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/>
-  <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482"
+  <users id="101"
+         login="marius"
+         name="Marius"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="&#10;ma&#10;marius33&#10;"
+         created_at="1418215735482"
          updated_at="1418215735485"
-         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/>
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"
+         is_root="[false]"/>
+  <users id="102"
+         login="sbrandhof"
+         name="Simon Brandhof"
+         email="marius@lesbronzes.fr"
+         active="[true]"
+         scm_accounts="[null]"
+         created_at="1418215735482"
+         updated_at="1418215735485"
+         salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366"
+         crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"
+         is_root="[false]"/>
 
 </dataset>
index 621e018f88b204b8e2dd335a3774bb933bdc2311..a15c10259bcd463abfd074e6b360ff26277e27f4 100644 (file)
@@ -1,4 +1,10 @@
 <dataset>
-  <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482"
-         active="[true]"/>
+  <users id="1"
+         login="john"
+         name="John"
+         email="jo@hn.com"
+         created_at="1418215735482"
+         updated_at="1418215735482"
+         active="[true]"
+         is_root="[false]"/>
 </dataset>