[midPoint-git] [Evolveum/midpoint] 011723: fixing tests
Viliam Repan
vilo.repan at evolveum.com
Wed Feb 21 13:50:38 CET 2018
Branch: refs/heads/feature/raw-shadow
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: 5e7831676ea661ee63f2af5b8269811e17338322
https://github.com/Evolveum/midpoint/commit/5e7831676ea661ee63f2af5b8269811e17338322
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M dist/src/main/bin/ninja.sh
Log Message:
-----------
Copyright header
Commit: 88854ae1494e66e36f184dadc4e08187b2b37c1d
https://github.com/Evolveum/midpoint/commit/88854ae1494e66e36f184dadc4e08187b2b37c1d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointStringResourceLoader.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/MockWebApplicationContext.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java
Log Message:
-----------
Fixing GUI tests ... and some GUI code robustness
Commit: c63ca4b0ac18b4472699d2abe545bbeda5942c5a
https://github.com/Evolveum/midpoint/commit/c63ca4b0ac18b4472699d2abe545bbeda5942c5a
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
Log Message:
-----------
CSS fix for narrow screens
Commit: 6cfbe38c8f2dc19d3bb5bcad3d233c7c3f167b17
https://github.com/Evolveum/midpoint/commit/6cfbe38c8f2dc19d3bb5bcad3d233c7c3f167b17
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
Log Message:
-----------
Fix for table overflow (MID-4309)
Commit: f054694dd8d9646a981c87f8559894c804a5e1e3
https://github.com/Evolveum/midpoint/commit/f054694dd8d9646a981c87f8559894c804a5e1e3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
A samples/roles/role-meta-approval-by-approver.xml
Log Message:
-----------
Approval policy metarole sample
Commit: d907e7075e598a76f1ef2aed57b30835422e71a4
https://github.com/Evolveum/midpoint/commit/d907e7075e598a76f1ef2aed57b30835422e71a4
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2018-02-19 (Mon, 19 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 branch 'post-3.7-fixes'
Commit: 5f25851ceef5cfbe5c7439b1e15f01f2ddf1e541
https://github.com/Evolveum/midpoint/commit/5f25851ceef5cfbe5c7439b1e15f01f2ddf1e541
Author: Kristian <ksuchanovsky at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
R dist/src/main/bin/export.bat
R dist/src/main/bin/export.sh
R dist/src/main/bin/import.bat
R dist/src/main/bin/import.sh
R dist/src/main/bin/keys.bat
R dist/src/main/bin/keys.sh
M dist/src/main/bin/ninja.bat
M dist/src/main/bin/ninja.sh
Log Message:
-----------
Modified ninja scripts for linux and windows
Commit: e4ed4fb580d0186c8dbca96fa32ffa89ee3eddf3
https://github.com/Evolveum/midpoint/commit/e4ed4fb580d0186c8dbca96fa32ffa89ee3eddf3
Author: Kristian <ksuchanovsky at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M dist/src/main/bin/ninja.sh
Log Message:
-----------
Copyright header
Commit: 3a83dfe713c0bdebe38962ace1c371218d8f997b
https://github.com/Evolveum/midpoint/commit/3a83dfe713c0bdebe38962ace1c371218d8f997b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
MID-3335 introduced subtype
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: 16631bb8770433367d1984974c7a0d7724b76b99
https://github.com/Evolveum/midpoint/commit/16631bb8770433367d1984974c7a0d7724b76b99
Author: Viliam Repan <vilo.repan 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/data/BaseSortableDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
MID-4459 sorting in object tables now configurable. By default enabled.
Commit: 230188fc1b2a2f2f709a6b36f3f2c0a701861bd7
https://github.com/Evolveum/midpoint/commit/230188fc1b2a2f2f709a6b36f3f2c0a701861bd7
Author: Viliam Repan <vilo.repan 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/data/BaseSortableDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableHeadersToolbar.java
Log Message:
-----------
MID-4459 disable sorting option, UI enhancements
Commit: 81ae3fb34a4e9e37431f89ea2172bcd81081fc2b
https://github.com/Evolveum/midpoint/commit/81ae3fb34a4e9e37431f89ea2172bcd81081fc2b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
Revert "MID-3335 introduced subtype"
This reverts commit 3a83dfe
Commit: 917fac886909fb2dc2024964522b5daee9da8812
https://github.com/Evolveum/midpoint/commit/917fac886909fb2dc2024964522b5daee9da8812
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
MID-3335 introduced objecttype.subtype
Commit: 0a9dcf7a6196c859e20e98581f426384c0190f18
https://github.com/Evolveum/midpoint/commit/0a9dcf7a6196c859e20e98581f426384c0190f18
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
MID-3555 moved locality and costCenter to focustype
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: ede3c0586c3bf68e8dbcd6a932066e4408d71d09
https://github.com/Evolveum/midpoint/commit/ede3c0586c3bf68e8dbcd6a932066e4408d71d09
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
MID-3555 moved emailAddress, telephoneNumber, preferredLanguage, timezone and locale from user to focus
Commit: 65accbcf0720f8bccf241815b1eea6857faf282e
https://github.com/Evolveum/midpoint/commit/65accbcf0720f8bccf241815b1eea6857faf282e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M infra/schema/src/test/resources/common/user-jack.xml
Log Message:
-----------
fixed schema test
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
Commit: 2626af75a8ea89f3fde6660cf9f404228deaab18
https://github.com/Evolveum/midpoint/commit/2626af75a8ea89f3fde6660cf9f404228deaab18
Author: Viliam Repan <vilo.repan 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 remote-tracking branch 'origin/master' into feature/db-changes
Commit: 1e12bf31da6a6e97909137a12b0316ee5a0f21c1
https://github.com/Evolveum/midpoint/commit/1e12bf31da6a6e97909137a12b0316ee5a0f21c1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
Log Message:
-----------
MID-3469 removed deprecated result from user table, xsd remains unchanged
Commit: 3fd26d91771b0477748db5af11e344cf5713a131
https://github.com/Evolveum/midpoint/commit/3fd26d91771b0477748db5af11e344cf5713a131
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
Log Message:
-----------
removed dead code
Commit: 9554e37ea5920ced2ec1f2637544ddf2cab075d7
https://github.com/Evolveum/midpoint/commit/9554e37ea5920ced2ec1f2637544ddf2cab075d7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M config/sql/_all/h2-3.8-all.sql
M config/sql/_all/mysql-3.8-all.sql
M config/sql/_all/oracle-3.8-all.sql
M config/sql/_all/postgresql-3.8-all.sql
M config/sql/_all/sqlserver-3.8-all.sql
Log Message:
-----------
updated all scripts
Commit: 1ea339593e3d187a7c7c0f00bde203a9df147f99
https://github.com/Evolveum/midpoint/commit/1ea339593e3d187a7c7c0f00bde203a9df147f99
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M config/sql/_all/h2-3.8-all.sql
M config/sql/_all/mysql-3.8-all.sql
M config/sql/_all/oracle-3.8-all.sql
M config/sql/_all/postgresql-3.8-all.sql
M config/sql/_all/sqlserver-3.8-all.sql
R dist/src/main/bin/export.bat
R dist/src/main/bin/export.sh
R dist/src/main/bin/import.bat
R dist/src/main/bin/import.sh
R dist/src/main/bin/keys.bat
R dist/src/main/bin/keys.sh
M dist/src/main/bin/ninja.bat
M dist/src/main/bin/ninja.sh
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.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/data/TableHeadersToolbar.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointStringResourceLoader.java
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/MockWebApplicationContext.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
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/localization/schema.properties
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 infra/schema/src/test/resources/common/user-jack.xml
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
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.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
A samples/roles/role-meta-approval-by-approver.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/raw-shadow
Compare: https://github.com/Evolveum/midpoint/compare/627516cc3802...1ea339593e3d
More information about the midPoint-svn
mailing list