[midPoint-git] [Evolveum/midpoint] 7835ab: Attempt to fix MID-4160: Expected that spring secu...
Radovan Semancik
radovan.semancik at evolveum.com
Mon Oct 2 14:19:09 CEST 2017
Branch: refs/heads/extended-3.6
Home: https://github.com/Evolveum/midpoint
Commit: 7835ab8ed827f56b5db0926ea19a125194802bc9
https://github.com/Evolveum/midpoint/commit/7835ab8ed827f56b5db0926ea19a125194802bc9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
Log Message:
-----------
Attempt to fix MID-4160: Expected that spring security principal will be of type MidPointPrincipal
(added logging out from task execution thread on task handler finish
and clearing the security context before attempting log-in at task start)
(cherry picked from commit 3a0cd24)
Commit: 45b98e2cb5436c33b8ce32400e70ecaf2bfaeed1
https://github.com/Evolveum/midpoint/commit/45b98e2cb5436c33b8ce32400e70ecaf2bfaeed1
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M repo/task-quartz-impl/pom.xml
Log Message:
-----------
Forgotten dependency
(cherry picked from commit 6a0a2dd)
Commit: ac7473682f0e816f853e3f55e1d0dce20831c608
https://github.com/Evolveum/midpoint/commit/ac7473682f0e816f853e3f55e1d0dce20831c608
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
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/query2/restriction/FullTextRestriction.java
Log Message:
-----------
Support for multi-word full text queries.
(cherry picked from commit 5fe57aa)
Commit: b3a1a802517f04d371844f0724585b4eff145a65
https://github.com/Evolveum/midpoint/commit/b3a1a802517f04d371844f0724585b4eff145a65
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
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/query2/restriction/FullTextRestriction.java
Log Message:
-----------
Removed exception when doing full-text search for no words.
(cherry picked from commit 3241d5d)
Commit: 5ae6e0d64e0f6a15c6310be8200dc20d1c3292d4
https://github.com/Evolveum/midpoint/commit/5ae6e0d64e0f6a15c6310be8200dc20d1c3292d4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
Log Message:
-----------
Fixing bug in matchesForRecursion.
(cherry picked from commit 1e170b1)
Commit: 019e9cb4af1e76bc01c4aedd6d80c7ff9f1c0f05
https://github.com/Evolveum/midpoint/commit/019e9cb4af1e76bc01c4aedd6d80c7ff9f1c0f05
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Many fixes to activation, parallelism, test improvements. Work in progress. (MID-4154)
Commit: d3937bb4f7ea10f952f90fc698e9aa77cbb0b011
https://github.com/Evolveum/midpoint/commit/d3937bb4f7ea10f952f90fc698e9aa77cbb0b011
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/controller/ModelOperationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
Log Message:
-----------
More parallelism improvements, bugfixies and test improvements (MID-4154) ... but still work in progress
Commit: 6a66f603d17cbb4621c26e13a358951e1bade9c1
https://github.com/Evolveum/midpoint/commit/6a66f603d17cbb4621c26e13a358951e1bade9c1
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
Log Message:
-----------
Adjusting and improving tests, fixing conflict detection delay (MID-4154)
Commit: 490f3f73145e58db61892df972fff19e90eed675
https://github.com/Evolveum/midpoint/commit/490f3f73145e58db61892df972fff19e90eed675
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
Log Message:
-----------
Post-merge test fixes
Commit: 4fe7741ac27b5325bb36437585ba2e9e0bbd592f
https://github.com/Evolveum/midpoint/commit/4fe7741ac27b5325bb36437585ba2e9e0bbd592f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
A model/workflow-impl/src/test/resources/policy/role-role51a-slow.xml
A model/workflow-impl/src/test/resources/policy/role-role52a-slow.xml
A model/workflow-impl/src/test/resources/policy/role-role53a-slow.xml
M model/workflow-impl/testng-integration.xml
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
Log Message:
-----------
Option to serialize wf execution tasks.
Commit: 9286a0dff3ae5cde1381796cbb820f72f16c706c
https://github.com/Evolveum/midpoint/commit/9286a0dff3ae5cde1381796cbb820f72f16c706c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/controller/ModelOperationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/support-3.6' into support-3.6
Commit: b71dc2fe316d8695d4110b606045b0ef798b94c9
https://github.com/Evolveum/midpoint/commit/b71dc2fe316d8695d4110b606045b0ef798b94c9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-10-01 (Sun, 01 Oct 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
Log Message:
-----------
Align wf execution task config with the one in midPoint 3.7.
Commit: bcad901ca032fb2f2b1e537e9c3136c10a15d5d6
https://github.com/Evolveum/midpoint/commit/bcad901ca032fb2f2b1e537e9c3136c10a15d5d6
Author: kate <honchar at evolveum.com>
Date: 2017-10-01 (Sun, 01 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
Log Message:
-----------
MID-4086 fix
Commit: 83ffdafa1d51259c68aef33e0110b3cc70f28b4d
https://github.com/Evolveum/midpoint/commit/83ffdafa1d51259c68aef33e0110b3cc70f28b4d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
A model/workflow-impl/src/test/resources/policy/role-role50a-slow.xml
A model/workflow-impl/src/test/resources/policy/user-bob.xml
A model/workflow-impl/src/test/resources/policy/user-chuck.xml
Log Message:
-----------
Serializing wf execution tasks on object OID (not on request id).
Commit: 8920e3af6774f3cfdf91893662d9a2fefc2e6d89
https://github.com/Evolveum/midpoint/commit/8920e3af6774f3cfdf91893662d9a2fefc2e6d89
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
Log Message:
-----------
Merge remote-tracking branch 'origin/support-3.6' into support-3.6
Commit: 8e8f74776c3e04da6bfddd6d4362233cd5c892ab
https://github.com/Evolveum/midpoint/commit/8e8f74776c3e04da6bfddd6d4362233cd5c892ab
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
Log Message:
-----------
Better provisioning schema error message
Commit: 226e2bbeba0d91e82e258d47fcc05d06ad33af54
https://github.com/Evolveum/midpoint/commit/226e2bbeba0d91e82e258d47fcc05d06ad33af54
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.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-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/controller/ModelOperationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
M model/model-intest/testng-integration.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/processors/BaseModelInvocationProcessingHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
A model/workflow-impl/src/test/resources/policy/role-role50a-slow.xml
A model/workflow-impl/src/test/resources/policy/role-role51a-slow.xml
A model/workflow-impl/src/test/resources/policy/role-role52a-slow.xml
A model/workflow-impl/src/test/resources/policy/role-role53a-slow.xml
A model/workflow-impl/src/test/resources/policy/user-bob.xml
A model/workflow-impl/src/test/resources/policy/user-chuck.xml
M model/workflow-impl/testng-integration.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
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/query2/restriction/FullTextRestriction.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/task-quartz-impl/pom.xml
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
Log Message:
-----------
Merge branch 'support-3.6' into extended-3.6
Compare: https://github.com/Evolveum/midpoint/compare/feefd02cda8c...226e2bbeba0d
More information about the midPoint-svn
mailing list