[midPoint-git] [Evolveum/midpoint] 011723: fixing tests
Radovan Semancik
radovan.semancik at evolveum.com
Wed Feb 21 10:52:00 CET 2018
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 011723b6a044ab6c8576ff9225cc1dd0718d7da0
https://github.com/Evolveum/midpoint/commit/011723b6a044ab6c8576ff9225cc1dd0718d7da0
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
Log Message:
-----------
fixing tests
Commit: 4b989bdf55473c44c9b3397b6ef80b4893020adb
https://github.com/Evolveum/midpoint/commit/4b989bdf55473c44c9b3397b6ef80b4893020adb
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M testing/story/testng-integration.xml
Log Message:
-----------
adding TestMapleLeaf to testing suite
Commit: d2cd74a179abc120639a9c97dba7104379a95496
https://github.com/Evolveum/midpoint/commit/d2cd74a179abc120639a9c97dba7104379a95496
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/manual/task-propagation-multi.xml
Log Message:
-----------
Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes
Commit: 545955a236d686a943797596db2bf5c5460cfe9e
https://github.com/Evolveum/midpoint/commit/545955a236d686a943797596db2bf5c5460cfe9e
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssociationDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssociationDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterEntry.java
M infra/schema/src/main/resources/localization/schema.properties
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
Log Message:
-----------
Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes
Commit: 219c8261965f0a4d1e5aa482999ea8083f8b4294
https://github.com/Evolveum/midpoint/commit/219c8261965f0a4d1e5aa482999ea8083f8b4294
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
A samples/hogwarts/accounts.csv
A samples/hogwarts/groups.ldif
A samples/hogwarts/objects/accessCertificationDefinitions/access-certification-definition.xml
A samples/hogwarts/objects/objectTemplates/object-template-create-org-struct.xml
A samples/hogwarts/objects/objectTemplates/object-template-user.xml
A samples/hogwarts/objects/orgs/org-hogwarts.xml
A samples/hogwarts/objects/orgs/org-minister-of-magic.xml
A samples/hogwarts/objects/orgs/org-quiddich-griffindor.xml
A samples/hogwarts/objects/orgs/org-quiddich-hufflepuff.xml
A samples/hogwarts/objects/orgs/org-quiddich-ravenclaw.xml
A samples/hogwarts/objects/orgs/org-quiddich-slytherin.xml
A samples/hogwarts/objects/orgs/org-quiddich-teams.xml
A samples/hogwarts/objects/resources/resource-csv.xml
A samples/hogwarts/objects/resources/resource-openldap.xml
A samples/hogwarts/objects/roles/role-approver.xml
A samples/hogwarts/objects/roles/role-duelling-classromm-access.xml
A samples/hogwarts/objects/roles/role-end-user.xml
A samples/hogwarts/objects/roles/role-herbology-teacher.xml
A samples/hogwarts/objects/roles/role-ldap.xml
A samples/hogwarts/objects/roles/role-manager-full-control.xml
A samples/hogwarts/objects/roles/role-meta-ldap-group.xml
A samples/hogwarts/objects/roles/role-owner.xml
A samples/hogwarts/objects/roles/role-policy-rule-sod.xml
A samples/hogwarts/objects/roles/role-policy-rule.xml
A samples/hogwarts/objects/roles/role-potions-teacher.xml
A samples/hogwarts/objects/roles/role-transfiguration-defense-against-dark.xml
A samples/hogwarts/objects/roles/role-transfiguration-teacher.xml
A samples/hogwarts/objects/systemConfiguration/system-configuration.xml
A samples/hogwarts/objects/users/user-fudge.xml
Log Message:
-----------
hogwarts config..
Commit: e764a63efc3a7d8600891caa5c4a76d6e7076bc6
https://github.com/Evolveum/midpoint/commit/e764a63efc3a7d8600891caa5c4a76d6e7076bc6
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M samples/hogwarts/accounts.csv
Log Message:
-----------
fixing source file
Commit: 4ab23f313cb6578733dc0b480b4b518a72cf798d
https://github.com/Evolveum/midpoint/commit/4ab23f313cb6578733dc0b480b4b518a72cf798d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
M model/model-intest/src/test/resources/orgstruct/role-meta-piracy-org.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion-manager-member.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
Log Message:
-----------
Fix MID-4450: Role exclusion ignores relations
The exclusion constraint ignored relations altogether, triggering
even if one of conflicting roles was assigned e.g. as approver.
To resolve this, order constraints on the exclusion
are introduced (although only partially supported now).
!!! Fixed a bug in orderConstraint processing. Missing value of
relation was interpreted as "default", although it should be correctly
interpreted as "any". Deployments should be adapted. !!!
Commit: a60a5edd8f0547008dbe32b544268a89eb716697
https://github.com/Evolveum/midpoint/commit/a60a5edd8f0547008dbe32b544268a89eb716697
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
A samples/roles/role-meta-approval-by-approver.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/post-3.7-fixes' into post-3.7-fixes
Commit: 60d1261e76feb82df548821ecd0fd192ad0ab674
https://github.com/Evolveum/midpoint/commit/60d1261e76feb82df548821ecd0fd192ad0ab674
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
Log Message:
-----------
very first schema and impelemntation for reset password
Commit: 314fa774acc0405c6c03fcc8ef82fb833f3e1066
https://github.com/Evolveum/midpoint/commit/314fa774acc0405c6c03fcc8ef82fb833f3e1066
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
M model/model-intest/src/test/resources/orgstruct/role-meta-piracy-org.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion-manager-member.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
A samples/roles/role-meta-approval-by-approver.xml
Log Message:
-----------
Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes
Commit: 81142b6288a92e3820f3d1b6179509b4b83cb059
https://github.com/Evolveum/midpoint/commit/81142b6288a92e3820f3d1b6179509b4b83cb059
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
M model/certification-impl/src/test/resources/common/system-configuration.xml
M model/certification-impl/src/test/resources/ctx-certification-test-main.xml
R model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/PerformerCommentsFormatter.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/PerformerCommentsFormatterImpl.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
M model/workflow-impl/src/test/resources/common/system-configuration.xml
M model/workflow-impl/src/test/resources/policy/object/system-configuration.xml
M model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
M model/workflow-impl/src/test/resources/policy/system-configuration.xml
Log Message:
-----------
Implement MID-4453: Performer info in comments
Formatting of approver/reviewer comments in metadata can now be
customized using expressions related to approver/reviewer,
approval/certification output and some environmental information.
(Experimental feature.)
Commit: 921679b7f43dface207d8f17e2c846db112cc076
https://github.com/Evolveum/midpoint/commit/921679b7f43dface207d8f17e2c846db112cc076
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
A samples/hogwarts/accounts.csv
A samples/hogwarts/groups.ldif
A samples/hogwarts/objects/accessCertificationDefinitions/access-certification-definition.xml
A samples/hogwarts/objects/objectTemplates/object-template-create-org-struct.xml
A samples/hogwarts/objects/objectTemplates/object-template-user.xml
A samples/hogwarts/objects/orgs/org-hogwarts.xml
A samples/hogwarts/objects/orgs/org-minister-of-magic.xml
A samples/hogwarts/objects/orgs/org-quiddich-griffindor.xml
A samples/hogwarts/objects/orgs/org-quiddich-hufflepuff.xml
A samples/hogwarts/objects/orgs/org-quiddich-ravenclaw.xml
A samples/hogwarts/objects/orgs/org-quiddich-slytherin.xml
A samples/hogwarts/objects/orgs/org-quiddich-teams.xml
A samples/hogwarts/objects/resources/resource-csv.xml
A samples/hogwarts/objects/resources/resource-openldap.xml
A samples/hogwarts/objects/roles/role-approver.xml
A samples/hogwarts/objects/roles/role-duelling-classromm-access.xml
A samples/hogwarts/objects/roles/role-end-user.xml
A samples/hogwarts/objects/roles/role-herbology-teacher.xml
A samples/hogwarts/objects/roles/role-ldap.xml
A samples/hogwarts/objects/roles/role-manager-full-control.xml
A samples/hogwarts/objects/roles/role-meta-ldap-group.xml
A samples/hogwarts/objects/roles/role-owner.xml
A samples/hogwarts/objects/roles/role-policy-rule-sod.xml
A samples/hogwarts/objects/roles/role-policy-rule.xml
A samples/hogwarts/objects/roles/role-potions-teacher.xml
A samples/hogwarts/objects/roles/role-transfiguration-defense-against-dark.xml
A samples/hogwarts/objects/roles/role-transfiguration-teacher.xml
A samples/hogwarts/objects/systemConfiguration/system-configuration.xml
A samples/hogwarts/objects/users/user-fudge.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/post-3.7-fixes' into post-3.7-fixes
Commit: 60bc721e45ce1cf2b0aef100fb9db29b67204b03
https://github.com/Evolveum/midpoint/commit/60bc721e45ce1cf2b0aef100fb9db29b67204b03
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M model/certification-impl/pom.xml
Log Message:
-----------
build dependency fix
Commit: a210bb29710071cc7427097f78b0db5562192dfc
https://github.com/Evolveum/midpoint/commit/a210bb29710071cc7427097f78b0db5562192dfc
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/certification-impl/pom.xml
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
M model/certification-impl/src/test/resources/common/system-configuration.xml
M model/certification-impl/src/test/resources/ctx-certification-test-main.xml
R model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
M model/model-intest/src/test/resources/orgstruct/role-meta-piracy-org.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion-manager-member.xml
A model/model-intest/src/test/resources/rbac/sod/role-self-exclusion.xml
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/PerformerCommentsFormatter.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/PerformerCommentsFormatterImpl.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
M model/workflow-impl/src/test/resources/common/system-configuration.xml
M model/workflow-impl/src/test/resources/policy/object/system-configuration.xml
M model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
M model/workflow-impl/src/test/resources/policy/system-configuration.xml
A samples/hogwarts/accounts.csv
A samples/hogwarts/groups.ldif
A samples/hogwarts/objects/accessCertificationDefinitions/access-certification-definition.xml
A samples/hogwarts/objects/objectTemplates/object-template-create-org-struct.xml
A samples/hogwarts/objects/objectTemplates/object-template-user.xml
A samples/hogwarts/objects/orgs/org-hogwarts.xml
A samples/hogwarts/objects/orgs/org-minister-of-magic.xml
A samples/hogwarts/objects/orgs/org-quiddich-griffindor.xml
A samples/hogwarts/objects/orgs/org-quiddich-hufflepuff.xml
A samples/hogwarts/objects/orgs/org-quiddich-ravenclaw.xml
A samples/hogwarts/objects/orgs/org-quiddich-slytherin.xml
A samples/hogwarts/objects/orgs/org-quiddich-teams.xml
A samples/hogwarts/objects/resources/resource-csv.xml
A samples/hogwarts/objects/resources/resource-openldap.xml
A samples/hogwarts/objects/roles/role-approver.xml
A samples/hogwarts/objects/roles/role-duelling-classromm-access.xml
A samples/hogwarts/objects/roles/role-end-user.xml
A samples/hogwarts/objects/roles/role-herbology-teacher.xml
A samples/hogwarts/objects/roles/role-ldap.xml
A samples/hogwarts/objects/roles/role-manager-full-control.xml
A samples/hogwarts/objects/roles/role-meta-ldap-group.xml
A samples/hogwarts/objects/roles/role-owner.xml
A samples/hogwarts/objects/roles/role-policy-rule-sod.xml
A samples/hogwarts/objects/roles/role-policy-rule.xml
A samples/hogwarts/objects/roles/role-potions-teacher.xml
A samples/hogwarts/objects/roles/role-transfiguration-defense-against-dark.xml
A samples/hogwarts/objects/roles/role-transfiguration-teacher.xml
A samples/hogwarts/objects/systemConfiguration/system-configuration.xml
A samples/hogwarts/objects/users/user-fudge.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge branch 'post-3.7-fixes'
Commit: ed7966c111864c14a79982a5939a640aca05f42c
https://github.com/Evolveum/midpoint/commit/ed7966c111864c14a79982a5939a640aca05f42c
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M model/certification-impl/pom.xml
Log Message:
-----------
post-merge fix
Commit: 70e5fdf2e491c95b89f6befbe9d9885f590e0684
https://github.com/Evolveum/midpoint/commit/70e5fdf2e491c95b89f6befbe9d9885f590e0684
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
Log Message:
-----------
compilation fix
Compare: https://github.com/Evolveum/midpoint/compare/81ae3fb34a4e...70e5fdf2e491
More information about the midPoint-svn
mailing list