[midPoint-git] [Evolveum/midpoint] 3b0ef1: Preliminary definitionProcessing=ONLY_IF_EXISTS ha...

Radovan Semancik radovan.semancik at evolveum.com
Fri Aug 18 15:15:52 CEST 2017


  Branch: refs/heads/feature/wicket-serialization-checker
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3b0ef13777d180070d9e678addb75d6f4e217779
      https://github.com/Evolveum/midpoint/commit/3b0ef13777d180070d9e678addb75d6f4e217779
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.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/SchemaTransformer.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java

  Log Message:
  -----------
  Preliminary definitionProcessing=ONLY_IF_EXISTS handling; enabled when exporting shadows (MID-4076)
Fixed deepClone for ObjectClassCTD.
Optimized deepClone for PrismContainerValue.


  Commit: 76ec55e70f5fdddf98c4960fd145544ad89de9e2
      https://github.com/Evolveum/midpoint/commit/76ec55e70f5fdddf98c4960fd145544ad89de9e2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    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/objectdetails/UserDelegationsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/table.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.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/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M samples/resources/csv/midpoint-username.csv
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AdUtils.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/optimizing-definitions

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java


  Commit: 278a1f15da20ada8135129eb553c9f9b5d9848ae
      https://github.com/Evolveum/midpoint/commit/278a1f15da20ada8135129eb553c9f9b5d9848ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java

  Log Message:
  -----------
  After-merge fix.


  Commit: c15bffe81e1bb9fbbc50553293d374ae722d98ab
      https://github.com/Evolveum/midpoint/commit/c15bffe81e1bb9fbbc50553293d374ae722d98ab
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/FlexibleLabelModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDefinitionSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.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/TestIntegrationObjectWrapperFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Customizable summary panel


  Commit: 5541246a15af4eea30a350082a5efac5bdcf49e8
      https://github.com/Evolveum/midpoint/commit/5541246a15af4eea30a350082a5efac5bdcf49e8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

  Log Message:
  -----------
  Merge branch 'master' into feature/pre-3.7-improvements


  Commit: edaeaeda0b8af2100e59d35e96a7692cb48f3517
      https://github.com/Evolveum/midpoint/commit/edaeaeda0b8af2100e59d35e96a7692cb48f3517
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html

  Log Message:
  -----------
  Changing expand/collapse buttons (MID-3505)


  Commit: a6ed437f9bd7b6a0bfeef69bfb6f5b7e7f8bb41e
      https://github.com/Evolveum/midpoint/commit/a6ed437f9bd7b6a0bfeef69bfb6f5b7e7f8bb41e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.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/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    A samples/resources/coupa/coupa-resource.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/pre-3.7-improvements


  Commit: 02d817c091367e56c82cc3820f2aecee70c2f6a7
      https://github.com/Evolveum/midpoint/commit/02d817c091367e56c82cc3820f2aecee70c2f6a7
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  policy rules tab


  Commit: f7cee8c6de38a2809b2a1a764a32ecf3f2462ea4
      https://github.com/Evolveum/midpoint/commit/f7cee8c6de38a2809b2a1a764a32ecf3f2462ea4
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  policy rules tab improvements


  Commit: 7b5e3f34e1e987bb5a23b354afe79a68a0a98dbd
      https://github.com/Evolveum/midpoint/commit/7b5e3f34e1e987bb5a23b354afe79a68a0a98dbd
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    A 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/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java

  Log Message:
  -----------
  policy rules details draft


  Commit: d44dd4c09f538b4bcba96471f3c95a5334ea5464
      https://github.com/Evolveum/midpoint/commit/d44dd4c09f538b4bcba96471f3c95a5334ea5464
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  policy rules details finished


  Commit: 2aa32348f86b77025873845570edebc49801702e
      https://github.com/Evolveum/midpoint/commit/2aa32348f86b77025873845570edebc49801702e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java

  Log Message:
  -----------
  Minor prism enhancements.


  Commit: 99d8717ae8a58650baa593ff986667ecaf8f7da0
      https://github.com/Evolveum/midpoint/commit/99d8717ae8a58650baa593ff986667ecaf8f7da0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M build-system/pom.xml
    M config/sql/quartz/tables_postgres.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskEditableState.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.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/RTask.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImplUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_postgres.sql

  Log Message:
  -----------
  First attempt at node-sticky tasks.


  Commit: 5b7e4287c2ea9a86561f3b2e2cc8f58c5efde6eb
      https://github.com/Evolveum/midpoint/commit/5b7e4287c2ea9a86561f3b2e2cc8f58c5efde6eb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java

  Log Message:
  -----------
  Minor prism enhancements.

(cherry picked from commit 2aa3234)


  Commit: 3c8822dc6e23998159c648fdd13a926611a2d711
      https://github.com/Evolveum/midpoint/commit/3c8822dc6e23998159c648fdd13a926611a2d711
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java

  Log Message:
  -----------
  Cleaned-up NodeRegistrar a bit.


  Commit: d4c887a5377ea8d49f08ba6fee0ca7687af8f032
      https://github.com/Evolveum/midpoint/commit/d4c887a5377ea8d49f08ba6fee0ca7687af8f032
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java

  Log Message:
  -----------
  Unbelievable (MID-4091)


  Commit: fd48ef746623ac20863c52ac03e9de0e361b352e
      https://github.com/Evolveum/midpoint/commit/fd48ef746623ac20863c52ac03e9de0e361b352e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java

  Log Message:
  -----------
  Always setting fresh execution capabilities when starting Quartz scheduler.


  Commit: b277d40249341466b36eef9ce8e63754a125aa63
      https://github.com/Evolveum/midpoint/commit/b277d40249341466b36eef9ce8e63754a125aa63
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java

  Log Message:
  -----------
  Fixing connector initialization and handling of resource constants


  Commit: b0035948eeccb1f31a4d26041085d3f113e44fbe
      https://github.com/Evolveum/midpoint/commit/b0035948eeccb1f31a4d26041085d3f113e44fbe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/FlexibleLabelModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    A 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/AbstractAssignmentDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDefinitionSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Merge branch 'feature/pre-3.7-improvements'


  Commit: 868b787453d8fd14d092f447ead4f7d438a6cceb
      https://github.com/Evolveum/midpoint/commit/868b787453d8fd14d092f447ead4f7d438a6cceb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Switch to CSV connector 2.1-SNAPSHOT


  Commit: be702926cef231bb967075d758b07befaa5d0467
      https://github.com/Evolveum/midpoint/commit/be702926cef231bb967075d758b07befaa5d0467
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java

  Log Message:
  -----------
  imports cleanup


  Commit: 6a8a7cad3bd38b4afd36b9bf61b794025fb7cf8c
      https://github.com/Evolveum/midpoint/commit/6a8a7cad3bd38b4afd36b9bf61b794025fb7cf8c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Using quartz 2.3.0.e1.


  Commit: 5a7e2641660fe38d626093c1167715d495ab6411
      https://github.com/Evolveum/midpoint/commit/5a7e2641660fe38d626093c1167715d495ab6411
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M build-system/pom.xml
    M config/sql/quartz/tables_postgres.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/FlexibleLabelModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDefinitionSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskEditableState.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    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/RTask.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImplUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_postgres.sql

  Log Message:
  -----------
  Merge branch 'feature/node-sticky-tasks'


  Commit: 4d52a91128a7c217d6853df9ebf2c4b88d81cec1
      https://github.com/Evolveum/midpoint/commit/4d52a91128a7c217d6853df9ebf2c4b88d81cec1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M build-system/pom.xml
    A 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/AbstractAssignmentDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: e3a2eac7e4bc40e97b13c1fa110446b489e552a0
      https://github.com/Evolveum/midpoint/commit/e3a2eac7e4bc40e97b13c1fa110446b489e552a0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Making dependency convergence checker happy (related to new Quartz).


  Commit: c6efef3936cdaea08bf3a556d9dc29b0224d2780
      https://github.com/Evolveum/midpoint/commit/c6efef3936cdaea08bf3a556d9dc29b0224d2780
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.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/SchemaTransformer.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java

  Log Message:
  -----------
  Merge branch 'feature/optimizing-definitions-conservative'


  Commit: e8a0f61de0bea8fb8bdc15b310e80b613a3699d6
      https://github.com/Evolveum/midpoint/commit/e8a0f61de0bea8fb8bdc15b310e80b613a3699d6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    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/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    A samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml

  Log Message:
  -----------
  Generic ModelExecutionOptions for Add, Assign, Delete, Enable/Disable, Modify bulk actions.
Fixed missing options in shadow enable/disable bulk action.


  Commit: 543f3eab70e4fbaf664683eccdc66f16fbb367c7
      https://github.com/Evolveum/midpoint/commit/543f3eab70e4fbaf664683eccdc66f16fbb367c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java

  Log Message:
  -----------
  Fixed warning "Problem while unpacking evaluated trigger ...: referenced trigger with id 1 is not present among base triggers"


  Commit: 09da6b62c589760a4e9ea198f9b7ec24469a7141
      https://github.com/Evolveum/midpoint/commit/09da6b62c589760a4e9ea198f9b7ec24469a7141
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/QueryType.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml

  Log Message:
  -----------
  Bulk action: assign role/resource by name (related to MID-4065 - pre-approved batches)


  Commit: bed4235ea8bc574f9790fcc36d4d2cca5b136c4e
      https://github.com/Evolveum/midpoint/commit/bed4235ea8bc574f9790fcc36d4d2cca5b136c4e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml

  Log Message:
  -----------
  Sample for bulk assign role by name.


  Commit: 31dd2ce0ce932b3534600f779bccabd2991d55d6
      https://github.com/Evolveum/midpoint/commit/31dd2ce0ce932b3534600f779bccabd2991d55d6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.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/TestSemiManualDisable.java
    A 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-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
    M model/model-intest/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/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Experimental useProposedShadows for manual connectors.


  Commit: 97138b8a085d328bf4ba848ed4d720de378385a8
      https://github.com/Evolveum/midpoint/commit/97138b8a085d328bf4ba848ed4d720de378385a8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.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/TestSemiManualDisable.java
    A 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-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
    M model/model-intest/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/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Merge branch 'feature/draft-shadows'


  Commit: 7a6925c86ea5ecbcd3261e33a11f03a3c1e70dd6
      https://github.com/Evolveum/midpoint/commit/7a6925c86ea5ecbcd3261e33a11f03a3c1e70dd6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java

  Log Message:
  -----------
  Fixing the memory leak occurring during tests (on TaskManager reuse).


  Commit: c33baae774a9c0c3fa0d87258f7fc1e95d6cc49c
      https://github.com/Evolveum/midpoint/commit/c33baae774a9c0c3fa0d87258f7fc1e95d6cc49c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.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/TestSemiManualDisable.java
    A 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-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
    M model/model-intest/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/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: f6ce4c6e5881154790f387e014661d4caa04639d
      https://github.com/Evolveum/midpoint/commit/f6ce4c6e5881154790f387e014661d4caa04639d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    A config/sql/_all/h2-upgrade-3.6-3.7.sql
    A config/sql/_all/mysql-upgrade-3.6-3.7.sql
    A config/sql/_all/oracle-upgrade-3.6-3.7.sql
    A config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    A config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
    M config/sql/quartz/tables_h2.sql
    M config/sql/quartz/tables_mysql.sql
    M config/sql/quartz/tables_mysql_innodb.sql
    M config/sql/quartz/tables_oracle.sql
    M config/sql/quartz/tables_sqlServer.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_h2.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql_innodb.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_oracle.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql

  Log Message:
  -----------
  Updated DB scripts for Quartz 2.3.0.e1.


  Commit: 13de23216465e2ddb6320c809174d22001742c1b
      https://github.com/Evolveum/midpoint/commit/13de23216465e2ddb6320c809174d22001742c1b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Fixing connector initialization during test resource connection


  Commit: 1429dfaa5561c1d4323a39d68649c125aec44846
      https://github.com/Evolveum/midpoint/commit/1429dfaa5561c1d4323a39d68649c125aec44846
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  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/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.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/activiti/dao/ProcessInstanceProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInStage.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.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/ProcessSpecificContent.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java

  Log Message:
  -----------
  First version of getApprovalSchemaExecutionInformation (MID-4071: Approval process preview)


  Commit: a0470198bd4c8c1a1c6985909d3020696a60641e
      https://github.com/Evolveum/midpoint/commit/a0470198bd4c8c1a1c6985909d3020696a60641e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.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/processors/primary/PrimaryChangeProcessor.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/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java

  Log Message:
  -----------
  Previewing approval process also from model context i.e. from "preview changes" (MID-4071: Approval process preview)


  Commit: 866e3827150218a1f52a297df9b35a8087f12a31
      https://github.com/Evolveum/midpoint/commit/866e3827150218a1f52a297df9b35a8087f12a31
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    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/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.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/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/assignments/org-leads2122.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role25-very-complex-approval.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml

  Log Message:
  -----------
  Preview changes also for model java hooks (currently approval + enforcement).
Better test, not finished yet.


  Commit: 489843790585045053831975e7d485784bbbaad3
      https://github.com/Evolveum/midpoint/commit/489843790585045053831975e7d485784bbbaad3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: d19da83bd6a9b3748cc9edb0f94d7a1f1962db78
      https://github.com/Evolveum/midpoint/commit/d19da83bd6a9b3748cc9edb0f94d7a1f1962db78
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java

  Log Message:
  -----------
  Test for preview approval schema.


  Commit: c5e1513641abf696312155c10fcc4738e78c0c62
      https://github.com/Evolveum/midpoint/commit/c5e1513641abf696312155c10fcc4738e78c0c62
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  extension schemas rest endpoint


  Commit: b3bc30898f0009527c3701b4f90a95e822334f31
      https://github.com/Evolveum/midpoint/commit/b3bc30898f0009527c3701b4f90a95e822334f31
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    R cli/common/maven/maven-wrapper.jar
    R cli/common/maven/maven-wrapper.properties
    R cli/common/mvnw
    R cli/common/mvnw.bat
    R cli/common/pom.xml
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
    R cli/common/testng-integration.xml
    R cli/common/testng-unit.xml
    R cli/maven/maven-wrapper.jar
    R cli/maven/maven-wrapper.properties
    R cli/mvnw
    R cli/mvnw.bat
    R cli/ninja/README.MD
    R cli/ninja/maven/maven-wrapper.jar
    R cli/ninja/maven/maven-wrapper.properties
    R cli/ninja/mvnw
    R cli/ninja/mvnw.bat
    R cli/ninja/pom.xml
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
    R cli/ninja/src/main/resources/describe.properties
    R cli/ninja/src/main/resources/logback-ninja.xml
    R cli/ninja/src/main/resources/logback.xml
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
    R cli/ninja/src/test/resources/logback-test.xml
    R cli/ninja/src/test/resources/user.xml
    R cli/ninja/testng-integration.xml
    R cli/ninja/testng-unit.xml
    R cli/pom.xml
    R cli/seppuku/README.MD
    R cli/seppuku/maven/maven-wrapper.jar
    R cli/seppuku/maven/maven-wrapper.properties
    R cli/seppuku/mvnw
    R cli/seppuku/mvnw.bat
    R cli/seppuku/pom.xml
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
    R cli/seppuku/src/main/resources/ctx-main.xml
    R cli/seppuku/src/main/resources/describe.properties
    R cli/seppuku/src/main/resources/logback-seppuku.xml
    R cli/seppuku/src/main/resources/logback.xml
    R cli/seppuku/src/test/resources/logback-test.xml
    R cli/seppuku/testng-integration.xml
    R cli/seppuku/testng-unit.xml
    R cli/testng-integration.xml
    R cli/testng-unit.xml
    M pom.xml

  Log Message:
  -----------
  removed obsolete unused modules


  Commit: 5d31667a6516270c0776ac8f89737c8d1990b5f9
      https://github.com/Evolveum/midpoint/commit/5d31667a6516270c0776ac8f89737c8d1990b5f9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    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/wf/ApprovalProcessExecutionInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessPreviewsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessPreviewsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApproverEngagementDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java

  Log Message:
  -----------
  MID-4071 (Approval process preview): primitive GUI on work item and process details pages


  Commit: b87d61196293f7d89b1021fd1b05b07541166b6d
      https://github.com/Evolveum/midpoint/commit/b87d61196293f7d89b1021fd1b05b07541166b6d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    R cli/common/maven/maven-wrapper.jar
    R cli/common/maven/maven-wrapper.properties
    R cli/common/mvnw
    R cli/common/mvnw.bat
    R cli/common/pom.xml
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
    R cli/common/testng-integration.xml
    R cli/common/testng-unit.xml
    R cli/maven/maven-wrapper.jar
    R cli/maven/maven-wrapper.properties
    R cli/mvnw
    R cli/mvnw.bat
    R cli/ninja/README.MD
    R cli/ninja/maven/maven-wrapper.jar
    R cli/ninja/maven/maven-wrapper.properties
    R cli/ninja/mvnw
    R cli/ninja/mvnw.bat
    R cli/ninja/pom.xml
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
    R cli/ninja/src/main/resources/describe.properties
    R cli/ninja/src/main/resources/logback-ninja.xml
    R cli/ninja/src/main/resources/logback.xml
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
    R cli/ninja/src/test/resources/logback-test.xml
    R cli/ninja/src/test/resources/user.xml
    R cli/ninja/testng-integration.xml
    R cli/ninja/testng-unit.xml
    R cli/pom.xml
    R cli/seppuku/README.MD
    R cli/seppuku/maven/maven-wrapper.jar
    R cli/seppuku/maven/maven-wrapper.properties
    R cli/seppuku/mvnw
    R cli/seppuku/mvnw.bat
    R cli/seppuku/pom.xml
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
    R cli/seppuku/src/main/resources/ctx-main.xml
    R cli/seppuku/src/main/resources/describe.properties
    R cli/seppuku/src/main/resources/logback-seppuku.xml
    R cli/seppuku/src/main/resources/logback.xml
    R cli/seppuku/src/test/resources/logback-test.xml
    R cli/seppuku/testng-integration.xml
    R cli/seppuku/testng-unit.xml
    R cli/testng-integration.xml
    R cli/testng-unit.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: b11692aa8838f8942a5bb3ca7d47604c286deb7a
      https://github.com/Evolveum/midpoint/commit/b11692aa8838f8942a5bb3ca7d47604c286deb7a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessPreviewsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessPreviewsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.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/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java

  Log Message:
  -----------
  MID-4071: showing approvals preview (and policy violations) on "preview changes" page.


  Commit: d55f86874f1edfd6e66e77c6f06a118f21e5fc3a
      https://github.com/Evolveum/midpoint/commit/d55f86874f1edfd6e66e77c6f06a118f21e5fc3a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ApprovalOutcomeIcon.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApproverEngagementDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java

  Log Message:
  -----------
  MID-4071: semi-graphical representation of approval processes


  Commit: d65a5387db459ee8f97cfca46f1853be1883534f
      https://github.com/Evolveum/midpoint/commit/d65a5387db459ee8f97cfca46f1853be1883534f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/TestManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.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/role-two-manual.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual.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/ResourceObjectConverter.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java

  Log Message:
  -----------
  Fixing validFrom assignments, some manual resource fixes (MID-4095)


  Commit: 3acdaac9c0f7814d2ef729c64f236cb255775e4b
      https://github.com/Evolveum/midpoint/commit/3acdaac9c0f7814d2ef729c64f236cb255775e4b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-05 (Sat, 05 Aug 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java

  Log Message:
  -----------
  simple get operation perf test


  Commit: 799cdb792f90a6799a7f0d228af0159defacb9d4
      https://github.com/Evolveum/midpoint/commit/799cdb792f90a6799a7f0d228af0159defacb9d4
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-08-05 (Sat, 05 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties

  Log Message:
  -----------
  Translation, WIP


  Commit: 01bdd2c4e66d70d7f0d132c6a71c8ad47543125a
      https://github.com/Evolveum/midpoint/commit/01bdd2c4e66d70d7f0d132c6a71c8ad47543125a
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageImportResource.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4100 fix


  Commit: 7ff52b2f503f1c7fd878dc4ed618804cd3bde8f2
      https://github.com/Evolveum/midpoint/commit/7ff52b2f503f1c7fd878dc4ed618804cd3bde8f2
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M build-system/pom.xml
    R cli/common/maven/maven-wrapper.jar
    R cli/common/maven/maven-wrapper.properties
    R cli/common/mvnw
    R cli/common/mvnw.bat
    R cli/common/pom.xml
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
    R cli/common/testng-integration.xml
    R cli/common/testng-unit.xml
    R cli/maven/maven-wrapper.jar
    R cli/maven/maven-wrapper.properties
    R cli/mvnw
    R cli/mvnw.bat
    R cli/ninja/README.MD
    R cli/ninja/maven/maven-wrapper.jar
    R cli/ninja/maven/maven-wrapper.properties
    R cli/ninja/mvnw
    R cli/ninja/mvnw.bat
    R cli/ninja/pom.xml
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
    R cli/ninja/src/main/resources/describe.properties
    R cli/ninja/src/main/resources/logback-ninja.xml
    R cli/ninja/src/main/resources/logback.xml
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
    R cli/ninja/src/test/resources/logback-test.xml
    R cli/ninja/src/test/resources/user.xml
    R cli/ninja/testng-integration.xml
    R cli/ninja/testng-unit.xml
    R cli/pom.xml
    R cli/seppuku/README.MD
    R cli/seppuku/maven/maven-wrapper.jar
    R cli/seppuku/maven/maven-wrapper.properties
    R cli/seppuku/mvnw
    R cli/seppuku/mvnw.bat
    R cli/seppuku/pom.xml
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
    R cli/seppuku/src/main/resources/ctx-main.xml
    R cli/seppuku/src/main/resources/describe.properties
    R cli/seppuku/src/main/resources/logback-seppuku.xml
    R cli/seppuku/src/main/resources/logback.xml
    R cli/seppuku/src/test/resources/logback-test.xml
    R cli/seppuku/testng-integration.xml
    R cli/seppuku/testng-unit.xml
    R cli/testng-integration.xml
    R cli/testng-unit.xml
    A config/sql/_all/h2-upgrade-3.6-3.7.sql
    A config/sql/_all/mysql-upgrade-3.6-3.7.sql
    A config/sql/_all/oracle-upgrade-3.6-3.7.sql
    A config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    A config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
    M config/sql/quartz/tables_h2.sql
    M config/sql/quartz/tables_mysql.sql
    M config/sql/quartz/tables_mysql_innodb.sql
    M config/sql/quartz/tables_oracle.sql
    M config/sql/quartz/tables_postgres.sql
    M config/sql/quartz/tables_sqlServer.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    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/gui/impl/model/FlexibleLabelModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    A 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/AbstractAssignmentDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.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/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.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/certification/CertDefinitionSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ApprovalOutcomeIcon.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskEditableState.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApproverEngagementDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    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/TestIntegrationObjectWrapperFactory.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/QueryType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/localization/schema_de.properties
    A infra/schema/src/main/resources/localization/schema_fi.properties
    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-notifications-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/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.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/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.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/TestManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-manual.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual.xml
    M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/CustomTransport.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/FileTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/TransportUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.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/activiti/dao/ProcessInstanceProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInStage.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.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/ProcessSpecificContent.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/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/assignments/org-leads2122.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role25-very-complex-approval.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml
    M pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.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/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.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/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.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/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImplUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_h2.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql_innodb.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_oracle.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_postgres.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql
    A samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: 4da651068ab7b480d18e2864219c7a3c97faf50e
      https://github.com/Evolveum/midpoint/commit/4da651068ab7b480d18e2864219c7a3c97faf50e
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  missing property is added


  Commit: 0296f89c25a37c2d13154708cda599bc98b3fb52
      https://github.com/Evolveum/midpoint/commit/0296f89c25a37c2d13154708cda599bc98b3fb52
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/src/test/resources/lens/user-drake.xml
    M model/model-impl/testng-unit.xml

  Log Message:
  -----------
  Fixed MID-4111: WF Delegation does not take from-to validity into consideration


  Commit: 9bf8a1330e9780672576793dd99cf3309e44f04f
      https://github.com/Evolveum/midpoint/commit/9bf8a1330e9780672576793dd99cf3309e44f04f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageImportResource.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/TestManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.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/role-two-manual.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual.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/ResourceObjectConverter.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 2e3525b89a9b0e3a3c93372abea04624a1445418
      https://github.com/Evolveum/midpoint/commit/2e3525b89a9b0e3a3c93372abea04624a1445418
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java

  Log Message:
  -----------
  MID-3639: preparatory work (DataLanguagePanel)


  Commit: c4f2362d3361fd4fea882cb97673a9fd022e33d7
      https://github.com/Evolveum/midpoint/commit/c4f2362d3361fd4fea882cb97673a9fd022e33d7
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java

  Log Message:
  -----------
  possible fix for MID-4102


  Commit: 6ee489f112ca0ddbbcd3e02be6bb0335eac94ff5
      https://github.com/Evolveum/midpoint/commit/6ee489f112ca0ddbbcd3e02be6bb0335eac94ff5
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/src/test/resources/lens/user-drake.xml
    M model/model-impl/testng-unit.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 418f5a4ae3ce7c983f7d2b6927066232de1dd6e5
      https://github.com/Evolveum/midpoint/commit/418f5a4ae3ce7c983f7d2b6927066232de1dd6e5
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 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: b30503ea7953a15d5d6591b3141d646fc2965f7c
      https://github.com/Evolveum/midpoint/commit/b30503ea7953a15d5d6591b3141d646fc2965f7c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerDomTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerXNodeTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractContainerValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPrismValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPropertyValueParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
    A infra/schema/src/test/resources/common/json/no-ns/objects.json
    A infra/schema/src/test/resources/common/json/ns/objects.json
    A infra/schema/src/test/resources/common/xml/no-ns/objects.xml
    A infra/schema/src/test/resources/common/xml/ns/objects.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/objects.yaml
    A infra/schema/src/test/resources/common/yaml/ns/objects.yaml
    M infra/schema/testng-unit.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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/importer/ObjectImporter.java
    A samples/certification/def-all-user-assignments.yaml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java

  Log Message:
  -----------
  MID-3639: first crude implementation


  Commit: cc588514a2ac7f909f650f3ae8f3ff6f84a1e526
      https://github.com/Evolveum/midpoint/commit/cc588514a2ac7f909f650f3ae8f3ff6f84a1e526
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    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 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 036d44c343032070018fc2abf2fb08b164ebaf09
      https://github.com/Evolveum/midpoint/commit/036d44c343032070018fc2abf2fb08b164ebaf09
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-after-const.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/FailableFunction.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java

  Log Message:
  -----------
  Fixing strange almost non-reproducible NPE when parsing values with expression.


  Commit: 1f3048bd95a79f89e044427a77d1ac4fee75f4ae
      https://github.com/Evolveum/midpoint/commit/1f3048bd95a79f89e044427a77d1ac4fee75f4ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserNoIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplNoIO.java

  Log Message:
  -----------
  MID-3639: started work on iterative parsing of JSON/YAML files


  Commit: 31cb73abc9fdbaf14d555d39d32133376e3e8d3a
      https://github.com/Evolveum/midpoint/commit/31cb73abc9fdbaf14d555d39d32133376e3e8d3a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-after-const.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/FailableFunction.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 4b8a2eb8c1e900fa45ad6d31ef4e5c02ca70b90b
      https://github.com/Evolveum/midpoint/commit/4b8a2eb8c1e900fa45ad6d31ef4e5c02ca70b90b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    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/orgstruct/TestOrgStruct.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacLightInitialProjection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacNoInbounds.java
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Attempt to reproduce MID-4110 in tests (not yet successful)


  Commit: f6bf0dccc574f68df86b316e70f0850de4d01ab0
      https://github.com/Evolveum/midpoint/commit/f6bf0dccc574f68df86b316e70f0850de4d01ab0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    A model/model-intest/src/test/resources/common/role-strong-sailor.xml
    M model/model-intest/src/test/resources/rbac/role-weak-singer.xml

  Log Message:
  -----------
  Even more tests for MID-4110


  Commit: ca7f079a459176bc2c247202ff69235998e998b3
      https://github.com/Evolveum/midpoint/commit/ca7f079a459176bc2c247202ff69235998e998b3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Possible fix for MID-4110 (+more tests)


  Commit: 7769d4849bfd10d1001ee68bf4ba625f3d9de2db
      https://github.com/Evolveum/midpoint/commit/7769d4849bfd10d1001ee68bf4ba625f3d9de2db
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.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/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java

  Log Message:
  -----------
  Fixing role count in tests


  Commit: b6292b57ff92f027c50c6ed7f1c37f50919c60aa
      https://github.com/Evolveum/midpoint/commit/b6292b57ff92f027c50c6ed7f1c37f50919c60aa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.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/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Recompute updates assignment effectiveStatus (MID-4114)


  Commit: 78e9fa99e64c42bed84ef5218c3010b43e632915
      https://github.com/Evolveum/midpoint/commit/78e9fa99e64c42bed84ef5218c3010b43e632915
  Author: Jan Melník <jan.melnik at email.cz>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Logging: Prudent RollingFileAppender support (remote & shared files) (#41)

* Logging: Prudent RollingFileAppender support (remote & shared files)

* (formatting typo)


  Commit: f339c7538e2a3bc39ca1638aaa65d5d96e8f4582
      https://github.com/Evolveum/midpoint/commit/f339c7538e2a3bc39ca1638aaa65d5d96e8f4582
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

  Log Message:
  -----------
  Translation, WIP


  Commit: 7cdfe305742591e3c72d79066cfbfae3f3bef8d7
      https://github.com/Evolveum/midpoint/commit/7cdfe305742591e3c72d79066cfbfae3f3bef8d7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    A infra/prism/src/test/resources/common/json/objects-1.json
    A infra/prism/src/test/resources/common/json/objects-2-wrong.json
    A infra/prism/src/test/resources/common/json/objects-3-ns.json
    A infra/prism/src/test/resources/common/json/objects-4-no-root-ns.json
    A infra/prism/src/test/resources/common/json/objects-5-error.json
    A infra/prism/src/test/resources/common/json/objects-6-single.json
    A infra/prism/src/test/resources/common/yaml/objects-1.yaml
    A infra/prism/src/test/resources/common/yaml/objects-2-wrong.yaml
    A infra/prism/src/test/resources/common/yaml/objects-3-ns.yaml
    A infra/prism/src/test/resources/common/yaml/objects-4-no-root-ns.yaml
    A infra/prism/src/test/resources/common/yaml/objects-5-error.yaml
    A infra/prism/src/test/resources/common/yaml/objects-6-single.yaml
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIteratively.java
    M infra/schema/testng-unit.xml

  Log Message:
  -----------
  LexicalProcessor.readObjectsIteratively done.


  Commit: f3e58dd55a653b8584e025af52bf3f438360a293
      https://github.com/Evolveum/midpoint/commit/f3e58dd55a653b8584e025af52bf3f438360a293
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PathHolderSegment.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialItemPathParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialXPathParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathHolder.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
    M infra/prism/src/test/resources/common/json/objects-3-ns.json
    M infra/prism/src/test/resources/common/json/objects-6-single.json
    A infra/prism/src/test/resources/common/json/objects-7-single.json
    A infra/prism/src/test/resources/common/xml/objects-1.xml
    A infra/prism/src/test/resources/common/xml/objects-3-ns.xml
    A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.json
    A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.xml
    A infra/prism/src/test/resources/common/xml/objects-5-error.json
    A infra/prism/src/test/resources/common/xml/objects-5-error.xml
    A infra/prism/src/test/resources/common/xml/objects-6-single.xml
    A infra/prism/src/test/resources/common/xml/objects-7-single.xml
    M infra/prism/src/test/resources/common/yaml/objects-3-ns.yaml
    M infra/prism/src/test/resources/common/yaml/objects-6-single.yaml
    A infra/prism/src/test/resources/common/yaml/objects-7-single.yaml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingTypeFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIteratively.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyFirstTwo.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyWrong.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/json/no-ns/objects-wrong.json
    A infra/schema/src/test/resources/common/json/ns/objects-wrong.json
    A infra/schema/src/test/resources/common/xml/no-ns/objects-wrong.xml
    A infra/schema/src/test/resources/common/xml/ns/objects-wrong.xml
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/objects-wrong.yaml
    A infra/schema/src/test/resources/common/yaml/ns/objects-wrong.yaml
    M infra/schema/testng-unit.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.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/importer/ObjectImporter.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/BadImportTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportRefTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/JsonImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/XmlImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/YamlImportTest.java
    A model/model-intest/src/test/resources/common/connector-dbtable.json
    A model/model-intest/src/test/resources/common/connector-dbtable.yaml
    A model/model-intest/src/test/resources/common/resource-dummy.json
    A model/model-intest/src/test/resources/common/resource-dummy.yaml
    A model/model-intest/src/test/resources/common/user-herman.json
    A model/model-intest/src/test/resources/common/user-herman.yaml
    A model/model-intest/src/test/resources/importer/import-bad.json
    A model/model-intest/src/test/resources/importer/import-bad.yaml
    A model/model-intest/src/test/resources/importer/import-ref.json
    M model/model-intest/src/test/resources/importer/import-ref.xml
    A model/model-intest/src/test/resources/importer/import-ref.yaml
    A model/model-intest/src/test/resources/importer/import-task.json
    A model/model-intest/src/test/resources/importer/import-task.yaml
    A model/model-intest/src/test/resources/importer/import-users-overwrite.json
    A model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    A model/model-intest/src/test/resources/importer/import-users.json
    A model/model-intest/src/test/resources/importer/import-users.yaml
    A model/model-intest/src/test/resources/importer/resource-derby.json
    A model/model-intest/src/test/resources/importer/resource-derby.yaml
    A model/model-intest/src/test/resources/importer/resource-dummy-changed.json
    A model/model-intest/src/test/resources/importer/resource-dummy-changed.yaml
    A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.json
    A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.yaml
    M model/model-intest/testng-integration.xml

  Log Message:
  -----------
  MID-3639 (import in JSON/YAML) practically done.

- readObjectsIteratively available also for XML
- readObjects/readObjectsIteratively uses element name (c:objects) to check for single object / multi object case
- error handling in object importer implemented for JSON/YAML
- fixed item path serialization for JSON/YAML


  Commit: 5e8238ee5cbfcd4fd13d61bb6c2281d0fe3a9f7a
      https://github.com/Evolveum/midpoint/commit/5e8238ee5cbfcd4fd13d61bb6c2281d0fe3a9f7a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java

  Log Message:
  -----------
  Fixed "summarize" options for JSON/YAML import.


  Commit: c6e6d10df6a2d7f7eb1fbc0d0fa6cf05667a557c
      https://github.com/Evolveum/midpoint/commit/c6e6d10df6a2d7f7eb1fbc0d0fa6cf05667a557c
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties

  Log Message:
  -----------
  Translation, WIP


  Commit: 7ec4854d87d255c481489aee208491e9331e8785
      https://github.com/Evolveum/midpoint/commit/7ec4854d87d255c481489aee208491e9331e8785
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerDomTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractJsonLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    M infra/prism/src/test/resources/common/json/objects-1.json
    A infra/prism/src/test/resources/common/json/objects-10-list-of-lists.json
    A infra/prism/src/test/resources/common/json/objects-2-wrong-2.json
    A infra/prism/src/test/resources/common/json/objects-9-list-single.json
    M infra/prism/src/test/resources/common/yaml/objects-1.yaml
    A infra/prism/src/test/resources/common/yaml/objects-10-list-of-lists.yaml
    A infra/prism/src/test/resources/common/yaml/objects-2-wrong-2.yaml
    A infra/prism/src/test/resources/common/yaml/objects-8-multi-document.yaml
    A infra/prism/src/test/resources/common/yaml/objects-9-list-single.yaml
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
    M model/model-intest/src/test/resources/importer/import-bad.yaml
    M model/model-intest/src/test/resources/importer/import-ref.yaml

  Log Message:
  -----------
  Support for multi-document YAML files and for "list of objects" format for JSON and YAML.


  Commit: 2227756947e32d564a25e4a571bff1434324cbf2
      https://github.com/Evolveum/midpoint/commit/2227756947e32d564a25e4a571bff1434324cbf2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    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-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.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/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacLightInitialProjection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacNoInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    A model/model-intest/src/test/resources/common/role-strong-sailor.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/rbac/role-weak-singer.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint_en.properties


  Commit: 83ff8252a7c224e9521ce1ee6be5047a9e0d4ed7
      https://github.com/Evolveum/midpoint/commit/83ff8252a7c224e9521ce1ee6be5047a9e0d4ed7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java

  Log Message:
  -----------
  Simple test for MID-4112


  Commit: 406fe7324be9b80d55d9daa76eab4497a99f52f9
      https://github.com/Evolveum/midpoint/commit/406fe7324be9b80d55d9daa76eab4497a99f52f9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Changed definition of preferredLanguage and locale properties to match the reality.


  Commit: 4a551725c92846ab762aabfccda5eff9b7e0f8f8
      https://github.com/Evolveum/midpoint/commit/4a551725c92846ab762aabfccda5eff9b7e0f8f8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 40007d0aac5b133b1de5eb84f2c1d5f0239e6096
      https://github.com/Evolveum/midpoint/commit/40007d0aac5b133b1de5eb84f2c1d5f0239e6096
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

  Log Message:
  -----------
  Translation update.

Thanks to all that contributed on Transifex:
AivoK (et), ardanu (tr), atuc2 (fi), Christian.Huber (de), claudio.victorero (fi), petr.gasparik (cs), wstaszewski (pl)


  Commit: 04e5c6ac7b6c4a2d1922111ac58d3db901a9e7fe
      https://github.com/Evolveum/midpoint/commit/04e5c6ac7b6c4a2d1922111ac58d3db901a9e7fe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java

  Log Message:
  -----------
  Fixed MID-4120: NPE when authorization contains substring filter


  Commit: c86a3e8e64c01888cad260e5247325c97e456c3f
      https://github.com/Evolveum/midpoint/commit/c86a3e8e64c01888cad260e5247325c97e456c3f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 20c030222a9fc2420dcb7d0f61379df2c84c252a
      https://github.com/Evolveum/midpoint/commit/20c030222a9fc2420dcb7d0f61379df2c84c252a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_MaybeDelete.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/ProgressInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.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-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.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/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  MID-4112: Resolution of conflicts arising during clockwork processing


  Commit: 4927ad4439377cb5a0f1c58a4b72b5393e51ba05
      https://github.com/Evolveum/midpoint/commit/4927ad4439377cb5a0f1c58a4b72b5393e51ba05
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.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/ProgressInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java

  Log Message:
  -----------
  MID-4112: Fixing midpoint startup failure, fixing progress reporting, adjusting default retry parameters


  Commit: 571efa77c886983313fa85424018671781600bd7
      https://github.com/Evolveum/midpoint/commit/571efa77c886983313fa85424018671781600bd7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java

  Log Message:
  -----------
  Some tests for conflict watchers.


  Commit: 64bac9ad878970d885dcadf0998396ecf8c24d36
      https://github.com/Evolveum/midpoint/commit/64bac9ad878970d885dcadf0998396ecf8c24d36
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4112: adapting object template GUI to keep conflict resolution info untouched


  Commit: 78b99b363d557995f9648483762dcab14d6cffbe
      https://github.com/Evolveum/midpoint/commit/78b99b363d557995f9648483762dcab14d6cffbe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-18 (Fri, 18 Aug 2017)

  Changed paths:
    M build-system/pom.xml
    R cli/common/maven/maven-wrapper.jar
    R cli/common/maven/maven-wrapper.properties
    R cli/common/mvnw
    R cli/common/mvnw.bat
    R cli/common/pom.xml
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
    R cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
    R cli/common/testng-integration.xml
    R cli/common/testng-unit.xml
    R cli/maven/maven-wrapper.jar
    R cli/maven/maven-wrapper.properties
    R cli/mvnw
    R cli/mvnw.bat
    R cli/ninja/README.MD
    R cli/ninja/maven/maven-wrapper.jar
    R cli/ninja/maven/maven-wrapper.properties
    R cli/ninja/mvnw
    R cli/ninja/mvnw.bat
    R cli/ninja/pom.xml
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
    R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
    R cli/ninja/src/main/resources/describe.properties
    R cli/ninja/src/main/resources/logback-ninja.xml
    R cli/ninja/src/main/resources/logback.xml
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
    R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
    R cli/ninja/src/test/resources/logback-test.xml
    R cli/ninja/src/test/resources/user.xml
    R cli/ninja/testng-integration.xml
    R cli/ninja/testng-unit.xml
    R cli/pom.xml
    R cli/seppuku/README.MD
    R cli/seppuku/maven/maven-wrapper.jar
    R cli/seppuku/maven/maven-wrapper.properties
    R cli/seppuku/mvnw
    R cli/seppuku/mvnw.bat
    R cli/seppuku/pom.xml
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
    R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
    R cli/seppuku/src/main/resources/ctx-main.xml
    R cli/seppuku/src/main/resources/describe.properties
    R cli/seppuku/src/main/resources/logback-seppuku.xml
    R cli/seppuku/src/main/resources/logback.xml
    R cli/seppuku/src/test/resources/logback-test.xml
    R cli/seppuku/testng-integration.xml
    R cli/seppuku/testng-unit.xml
    R cli/testng-integration.xml
    R cli/testng-unit.xml
    A config/sql/_all/h2-upgrade-3.6-3.7.sql
    A config/sql/_all/mysql-upgrade-3.6-3.7.sql
    A config/sql/_all/oracle-upgrade-3.6-3.7.sql
    A config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    A config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
    M config/sql/quartz/tables_h2.sql
    M config/sql/quartz/tables_mysql.sql
    M config/sql/quartz/tables_mysql_innodb.sql
    M config/sql/quartz/tables_oracle.sql
    M config/sql/quartz/tables_postgres.sql
    M config/sql/quartz/tables_sqlServer.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
    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/gui/impl/model/FlexibleLabelModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    A 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/AbstractAssignmentDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.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/certification/CertDefinitionSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageImportResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    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 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ApprovalOutcomeIcon.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskEditableState.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApproverEngagementDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    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/TestIntegrationObjectWrapperFactory.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserNoIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerDomTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerXNodeTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_MaybeDelete.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PathHolderSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplNoIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialItemPathParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialXPathParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathHolder.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractJsonLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
    A infra/prism/src/test/resources/common/json/objects-1.json
    A infra/prism/src/test/resources/common/json/objects-10-list-of-lists.json
    A infra/prism/src/test/resources/common/json/objects-2-wrong-2.json
    A infra/prism/src/test/resources/common/json/objects-2-wrong.json
    A infra/prism/src/test/resources/common/json/objects-3-ns.json
    A infra/prism/src/test/resources/common/json/objects-4-no-root-ns.json
    A infra/prism/src/test/resources/common/json/objects-5-error.json
    A infra/prism/src/test/resources/common/json/objects-6-single.json
    A infra/prism/src/test/resources/common/json/objects-7-single.json
    A infra/prism/src/test/resources/common/json/objects-9-list-single.json
    A infra/prism/src/test/resources/common/xml/objects-1.xml
    A infra/prism/src/test/resources/common/xml/objects-3-ns.xml
    A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.json
    A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.xml
    A infra/prism/src/test/resources/common/xml/objects-5-error.json
    A infra/prism/src/test/resources/common/xml/objects-5-error.xml
    A infra/prism/src/test/resources/common/xml/objects-6-single.xml
    A infra/prism/src/test/resources/common/xml/objects-7-single.xml
    A infra/prism/src/test/resources/common/yaml/objects-1.yaml
    A infra/prism/src/test/resources/common/yaml/objects-10-list-of-lists.yaml
    A infra/prism/src/test/resources/common/yaml/objects-2-wrong-2.yaml
    A infra/prism/src/test/resources/common/yaml/objects-2-wrong.yaml
    A infra/prism/src/test/resources/common/yaml/objects-3-ns.yaml
    A infra/prism/src/test/resources/common/yaml/objects-4-no-root-ns.yaml
    A infra/prism/src/test/resources/common/yaml/objects-5-error.yaml
    A infra/prism/src/test/resources/common/yaml/objects-6-single.yaml
    A infra/prism/src/test/resources/common/yaml/objects-7-single.yaml
    A infra/prism/src/test/resources/common/yaml/objects-8-multi-document.yaml
    A infra/prism/src/test/resources/common/yaml/objects-9-list-single.yaml
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingTypeFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.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/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/localization/schema_fi.properties
    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/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractContainerValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPrismValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPropertyValueParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIteratively.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyFirstTwo.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyWrong.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/json/no-ns/objects-wrong.json
    A infra/schema/src/test/resources/common/json/no-ns/objects.json
    A infra/schema/src/test/resources/common/json/ns/objects-wrong.json
    A infra/schema/src/test/resources/common/json/ns/objects.json
    A infra/schema/src/test/resources/common/xml/no-ns/objects-wrong.xml
    A infra/schema/src/test/resources/common/xml/no-ns/objects.xml
    A infra/schema/src/test/resources/common/xml/ns/objects-wrong.xml
    A infra/schema/src/test/resources/common/xml/ns/objects.xml
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/objects-wrong.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/objects.yaml
    A infra/schema/src/test/resources/common/yaml/ns/objects-wrong.yaml
    A infra/schema/src/test/resources/common/yaml/ns/objects.yaml
    A infra/schema/src/test/resources/diff/resource-after-const.xml
    M infra/schema/testng-unit.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/FailableFunction.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/ModelUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.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/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/OperationalDataManager.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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/src/test/resources/lens/user-drake.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/BadImportTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportRefTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/JsonImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/XmlImportTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/YamlImportTest.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/TestManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A 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/orgstruct/TestOrgStruct.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacLightInitialProjection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacNoInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    A model/model-intest/src/test/resources/common/connector-dbtable.json
    A model/model-intest/src/test/resources/common/connector-dbtable.yaml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    A model/model-intest/src/test/resources/common/resource-dummy.json
    A model/model-intest/src/test/resources/common/resource-dummy.yaml
    A model/model-intest/src/test/resources/common/role-strong-sailor.xml
    A model/model-intest/src/test/resources/common/user-herman.json
    A model/model-intest/src/test/resources/common/user-herman.yaml
    A model/model-intest/src/test/resources/importer/import-bad.json
    A model/model-intest/src/test/resources/importer/import-bad.yaml
    A model/model-intest/src/test/resources/importer/import-ref.json
    M model/model-intest/src/test/resources/importer/import-ref.xml
    A model/model-intest/src/test/resources/importer/import-ref.yaml
    A model/model-intest/src/test/resources/importer/import-task.json
    A model/model-intest/src/test/resources/importer/import-task.yaml
    A model/model-intest/src/test/resources/importer/import-users-overwrite.json
    A model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    A model/model-intest/src/test/resources/importer/import-users.json
    A model/model-intest/src/test/resources/importer/import-users.yaml
    A model/model-intest/src/test/resources/importer/resource-derby.json
    A model/model-intest/src/test/resources/importer/resource-derby.yaml
    A model/model-intest/src/test/resources/importer/resource-dummy-changed.json
    A model/model-intest/src/test/resources/importer/resource-dummy-changed.yaml
    A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.json
    A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.yaml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-manual.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual.xml
    M model/model-intest/src/test/resources/rbac/role-weak-singer.xml
    M model/model-intest/src/test/resources/scripting/assign-to-jack-2.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-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.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/activiti/dao/ProcessInstanceProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInStage.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.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/ProcessSpecificContent.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/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/assignments/org-leads2122.xml
    A model/workflow-impl/src/test/resources/policy/assignments/role-role25-very-complex-approval.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
    M model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml
    M pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.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/ProvisioningContext.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.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/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.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/manual/AbstractManualResourceTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.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/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImplUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_h2.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql_innodb.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_oracle.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_postgres.sql
    M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql
    A samples/certification/def-all-user-assignments.yaml
    A samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java

  Log Message:
  -----------
  Merge branch 'master' into feature/wicket-serialization-checker


Compare: https://github.com/Evolveum/midpoint/compare/848f7778f816...78b99b363d55


More information about the midPoint-svn mailing list