diff --git a/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml b/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml index f793a82697d..ecef9e6baba 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml @@ -21,5 +21,5 @@ http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all - system + system diff --git a/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml b/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml index 913ae18ed64..a05c137efac 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml @@ -221,5 +221,5 @@ - system + system \ No newline at end of file diff --git a/gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml b/gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml index 40092f03e88..36750762bc9 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml @@ -130,5 +130,5 @@ riskLevel serviceType - system + system diff --git a/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml b/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml index c07879e33a5..7a85cc01c9d 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml @@ -100,5 +100,5 @@ riskLevel serviceType - system + system diff --git a/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml b/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml index ac91f645527..3e8418e6b05 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml @@ -83,5 +83,5 @@ roleMembershipRef delegatedRef - system + system \ No newline at end of file diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java index d6b3ee82c49..33a2de92356 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java @@ -176,7 +176,7 @@ public static List determineSubTypes(PrismObject< return null; } - List subtypes = object.asObjectable().getSubType(); + List subtypes = object.asObjectable().getSubtype(); if (!subtypes.isEmpty()) { return subtypes; } @@ -208,7 +208,7 @@ public static boolean hasSubtype(PrismObject object, S public static void setSubtype(PrismObject object, List subtypes) { - List objSubtypes = object.asObjectable().getSubType(); + List objSubtypes = object.asObjectable().getSubtype(); if (!objSubtypes.isEmpty()) { objSubtypes.clear(); } diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd index 88cc9bacbfd..006965af06f 100755 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd @@ -192,7 +192,7 @@ - +

@@ -202,7 +202,7 @@

- ObjectType.subType + ObjectType.subtype 15 @@ -4154,7 +4154,7 @@ Therefore it can be used to distinguish employees from customers, etc.

- DEPRECATED: Use ObjectType.subType + DEPRECATED: Use ObjectType.subtype

@@ -12263,7 +12263,7 @@

- DEPRECATED: use ObjectType.subType + DEPRECATED: use ObjectType.subtype

@@ -12721,7 +12721,7 @@

- DEPRECATED: Use ObjectType.subType + DEPRECATED: Use ObjectType.subtype

@@ -12855,7 +12855,7 @@

- DEPRECATED: Use ObjectType.subType + DEPRECATED: Use ObjectType.subtype

@@ -14397,7 +14397,7 @@ Specification of the subtype of the object to apply this template to. If no subtype is specified then this definition will be applied to all subtypes. - The subtype is compared against the subType property but it is also compared to the + The subtype is compared against the subtype property but it is also compared to the deprecated employeeType, roleType, orgType and serviceType properties. diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java index 8b5295bf255..11b362e1787 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java @@ -705,7 +705,7 @@ private Collection createSingleDisplayableValueCollectio } private RoleSelectionSpecEntry getRoleSelectionSpecEq(EqualFilter eqFilter) throws SchemaException { - if (QNameUtil.match(RoleType.F_ROLE_TYPE, eqFilter.getElementName()) || QNameUtil.match(RoleType.F_SUB_TYPE, eqFilter.getElementName())) { + if (QNameUtil.match(RoleType.F_ROLE_TYPE, eqFilter.getElementName()) || QNameUtil.match(RoleType.F_SUBTYPE, eqFilter.getElementName())) { List> ppvs = eqFilter.getValues(); if (ppvs.size() > 1) { throw new SchemaException("More than one value in roleType search filter"); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java index b533079a40e..bdd6dc73be1 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java @@ -1295,7 +1295,7 @@ public void test185ModifyUserGuybrushSubtypeMarooned() throws Exception { // WHEN displayWhen(TEST_NAME); - modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUB_TYPE, task, result, SUBTYPE_MAROONED); + modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUBTYPE, task, result, SUBTYPE_MAROONED); // THEN displayThen(TEST_NAME); @@ -1324,7 +1324,7 @@ public void test189ModifyUserGuybrushSubtypeNone() throws Exception { // WHEN displayWhen(TEST_NAME); - modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUB_TYPE, task, result); + modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUBTYPE, task, result); // THEN displayThen(TEST_NAME); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java index 8670fc92a97..a17d1fd2724 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java @@ -1304,10 +1304,10 @@ public void test220AutzJackRoleExpressionNoConstCenter() throws Exception { assertSearchDeny(RoleType.class, null, null); assertSearchDeny(RoleType.class, - queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("business").build(), + queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("business").build(), null); assertSearchDeny(RoleType.class, - queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("application").build(), + queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("application").build(), null); assertGlobalStateUntouched(); @@ -1348,9 +1348,9 @@ public void test222AutzJackRoleExpressionConstCenterBusiness() throws Exception assertSearch(RoleType.class, null, 3); assertSearch(RoleType.class, - queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("business").build(), 3); + queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("business").build(), 3); assertSearchDeny(RoleType.class, - queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("application").build(), + queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("application").build(), null); assertGlobalStateUntouched(); @@ -1958,7 +1958,7 @@ public void test260AutzJackLimitedRoleAdministrator() throws Exception { display("Exclusion role edit schema", roleExclusionEditSchema); assertItemFlags(roleExclusionEditSchema, RoleType.F_NAME, true, true, true); assertItemFlags(roleExclusionEditSchema, RoleType.F_DESCRIPTION, true, true, true); - assertItemFlags(roleExclusionEditSchema, RoleType.F_SUB_TYPE, true, true, true); + assertItemFlags(roleExclusionEditSchema, RoleType.F_SUBTYPE, true, true, true); assertItemFlags(roleExclusionEditSchema, RoleType.F_LIFECYCLE_STATE, true, true, true); assertItemFlags(roleExclusionEditSchema, RoleType.F_METADATA, false, false, false); @@ -2219,7 +2219,7 @@ public void test264AutzJackLimitedReadRoleAdministrator() throws Exception { display("Exclusion role edit schema", roleEmptyEditSchema); assertItemFlags(roleEmptyEditSchema, RoleType.F_NAME, true, true, true); assertItemFlags(roleEmptyEditSchema, RoleType.F_DESCRIPTION, true, true, true); - assertItemFlags(roleEmptyEditSchema, RoleType.F_SUB_TYPE, true, true, true); + assertItemFlags(roleEmptyEditSchema, RoleType.F_SUBTYPE, true, true, true); assertItemFlags(roleEmptyEditSchema, RoleType.F_LIFECYCLE_STATE, true, true, true); assertItemFlags(roleEmptyEditSchema, RoleType.F_METADATA, false, false, false); diff --git a/model/model-intest/src/test/resources/common/role-persona-admin.xml b/model/model-intest/src/test/resources/common/role-persona-admin.xml index c2a8a1bbb3f..0816fa19629 100644 --- a/model/model-intest/src/test/resources/common/role-persona-admin.xml +++ b/model/model-intest/src/test/resources/common/role-persona-admin.xml @@ -25,6 +25,6 @@ - personaRole + personaRole true diff --git a/model/model-intest/src/test/resources/security/role-application-1.xml b/model/model-intest/src/test/resources/security/role-application-1.xml index 8c45c7fe3eb..98695331bf4 100644 --- a/model/model-intest/src/test/resources/security/role-application-1.xml +++ b/model/model-intest/src/test/resources/security/role-application-1.xml @@ -19,5 +19,5 @@ xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"> Application Role One - application + application diff --git a/model/model-intest/src/test/resources/security/role-application-2.xml b/model/model-intest/src/test/resources/security/role-application-2.xml index 9fa5c3346cf..4f7e3951390 100644 --- a/model/model-intest/src/test/resources/security/role-application-2.xml +++ b/model/model-intest/src/test/resources/security/role-application-2.xml @@ -18,5 +18,5 @@ xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"> Application Role Two - application + application diff --git a/model/model-intest/src/test/resources/security/role-approver.xml b/model/model-intest/src/test/resources/security/role-approver.xml index e2ce3b74d13..77ed7684551 100644 --- a/model/model-intest/src/test/resources/security/role-approver.xml +++ b/model/model-intest/src/test/resources/security/role-approver.xml @@ -97,7 +97,7 @@ identifier description riskLevel - subType + subtype orgs-read @@ -131,5 +131,5 @@ riskLevel serviceType - system + system diff --git a/model/model-intest/src/test/resources/security/role-assign-application-roles.xml b/model/model-intest/src/test/resources/security/role-assign-application-roles.xml index 067e1e1d4d0..21449551bf0 100644 --- a/model/model-intest/src/test/resources/security/role-assign-application-roles.xml +++ b/model/model-intest/src/test/resources/security/role-assign-application-roles.xml @@ -44,7 +44,7 @@ - subType + subtype application @@ -56,7 +56,7 @@ - subType + subtype nonexistent @@ -74,7 +74,7 @@ - subType + subtype application diff --git a/model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml b/model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml index c8172d4a5ac..a795297e65d 100644 --- a/model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml +++ b/model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml @@ -30,7 +30,7 @@ - subType + subtype application diff --git a/model/model-intest/src/test/resources/security/role-business-1.xml b/model/model-intest/src/test/resources/security/role-business-1.xml index 126a102d8e4..e1330f468f6 100644 --- a/model/model-intest/src/test/resources/security/role-business-1.xml +++ b/model/model-intest/src/test/resources/security/role-business-1.xml @@ -20,5 +20,5 @@ Business Role One true - business + business diff --git a/model/model-intest/src/test/resources/security/role-business-2.xml b/model/model-intest/src/test/resources/security/role-business-2.xml index 1db7d630994..402c0d76f2e 100644 --- a/model/model-intest/src/test/resources/security/role-business-2.xml +++ b/model/model-intest/src/test/resources/security/role-business-2.xml @@ -19,5 +19,5 @@ xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"> Business Role Two false - business + business diff --git a/model/model-intest/src/test/resources/security/role-business-3.xml b/model/model-intest/src/test/resources/security/role-business-3.xml index 27db410d371..5c137495ec3 100644 --- a/model/model-intest/src/test/resources/security/role-business-3.xml +++ b/model/model-intest/src/test/resources/security/role-business-3.xml @@ -19,5 +19,5 @@ xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"> Business Role Three true - business + business diff --git a/model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml b/model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml index 192a4d94c94..1f5a6a7dfc8 100644 --- a/model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml +++ b/model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml @@ -142,5 +142,5 @@ - system + system \ No newline at end of file diff --git a/model/model-intest/src/test/resources/security/role-expression-read-roles.xml b/model/model-intest/src/test/resources/security/role-expression-read-roles.xml index b7f55dfed8d..1cbc8e450e6 100644 --- a/model/model-intest/src/test/resources/security/role-expression-read-roles.xml +++ b/model/model-intest/src/test/resources/security/role-expression-read-roles.xml @@ -24,7 +24,7 @@ RoleType - subType + subtype filterNone diff --git a/model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml b/model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml index 4b87b447d5d..9bb9687ea63 100644 --- a/model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml +++ b/model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml @@ -35,7 +35,7 @@ name description - subType + subtype lifecycleState requestable delegable @@ -57,7 +57,7 @@ name description - subType + subtype lifecycleState requestable delegable @@ -71,7 +71,7 @@ name description - subType + subtype lifecycleState requestable delegable diff --git a/model/model-intest/src/test/resources/security/role-limited-role-administrator.xml b/model/model-intest/src/test/resources/security/role-limited-role-administrator.xml index 029c145ca55..af1792d2275 100644 --- a/model/model-intest/src/test/resources/security/role-limited-role-administrator.xml +++ b/model/model-intest/src/test/resources/security/role-limited-role-administrator.xml @@ -34,7 +34,7 @@ name description - subType + subtype lifecycleState requestable delegable @@ -49,7 +49,7 @@ name description - subType + subtype lifecycleState requestable delegable @@ -64,7 +64,7 @@ name description - subType + subtype lifecycleState requestable delegable diff --git a/model/model-intest/src/test/resources/security/role-persona-management.xml b/model/model-intest/src/test/resources/security/role-persona-management.xml index d3f85fdbd76..f36788191c0 100644 --- a/model/model-intest/src/test/resources/security/role-persona-management.xml +++ b/model/model-intest/src/test/resources/security/role-persona-management.xml @@ -65,7 +65,7 @@ RoleType - subType + subtype personaRole @@ -79,7 +79,7 @@ UserType - subType + subtype admin @@ -95,7 +95,7 @@ UserType - subType + subtype admin diff --git a/model/model-intest/src/test/resources/security/role-read-some-roles.xml b/model/model-intest/src/test/resources/security/role-read-some-roles.xml index 1d5b9dfcd79..d116168691e 100644 --- a/model/model-intest/src/test/resources/security/role-read-some-roles.xml +++ b/model/model-intest/src/test/resources/security/role-read-some-roles.xml @@ -28,11 +28,11 @@ - subType + subtype application - subType + subtype business diff --git a/model/model-intest/src/test/resources/security/role-vault-dweller.xml b/model/model-intest/src/test/resources/security/role-vault-dweller.xml index 4a50648a61b..d452a36d3b0 100644 --- a/model/model-intest/src/test/resources/security/role-vault-dweller.xml +++ b/model/model-intest/src/test/resources/security/role-vault-dweller.xml @@ -19,7 +19,7 @@ xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"> Vault Dweller - application + application @@ -34,11 +34,11 @@ - subType + subtype application - subType + subtype business diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java index 6e2d52388b7..895cbad5819 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java @@ -678,7 +678,7 @@ protected static void copyToJAXB(RObject repo, ObjectT jaxb.setVersion(Integer.toString(repo.getVersion())); jaxb.setLifecycleState(repo.getLifecycleState()); if (repo.getSubType() != null) { - jaxb.getSubType().addAll(repo.getSubType()); + jaxb.getSubtype().addAll(repo.getSubType()); } if (SelectorOptions.hasToLoadPath(ObjectType.F_PARENT_ORG_REF, options)) { @@ -702,7 +702,7 @@ public static void copyFromJAXB(ObjectType jaxb, RObject< repo.setName(RPolyString.copyFromJAXB(jaxb.getName())); repo.setLifecycleState(jaxb.getLifecycleState()); - repo.setSubType(RUtil.listToSet(jaxb.getSubType())); + repo.setSubType(RUtil.listToSet(jaxb.getSubtype())); String strVersion = jaxb.getVersion(); int version = StringUtils.isNotEmpty(strVersion) && strVersion.matches("[0-9]*") ? Integer.parseInt(jaxb diff --git a/samples/policy/meta/policies-meta-approval.xml b/samples/policy/meta/policies-meta-approval.xml index 9a445a31ab5..c68e11f133a 100644 --- a/samples/policy/meta/policies-meta-approval.xml +++ b/samples/policy/meta/policies-meta-approval.xml @@ -21,14 +21,14 @@ policy-meta-approval - policy + policy Group of approval polices. This group contains policies that deal with assignment approvals and lifecycle approvals. Approval policies meta-role-policy-assignment-approval-manager - policy + policy Assignment approval by user's manager @@ -66,7 +66,7 @@ meta-role-policy-assignment-approval-role-approver - policy + policy Assignment approval by any role approver @@ -100,7 +100,7 @@ meta-role-policy-assignment-approval-role-owners - policy + policy Assignment approval by all role owners