[midPoint-git] [Evolveum/midpoint] 7c660a: Rule-based wf approvals, interim commit.

[Petr Gašparík]

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7c660a5823595129fa79357af2ecfe5c5555a8a1
      https://github.com/Evolveum/midpoint/commit/7c660a5823595129fa79357af2ecfe5c5555a8a1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.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/SystemConfigurationHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.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/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.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/processors/primary/aspect/PrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java

  Log Message:
  -----------
  Rule-based wf approvals, interim commit.


  Commit: adcb691a88b115a6df9150a08e35e711b406ce4d
      https://github.com/Evolveum/midpoint/commit/adcb691a88b115a6df9150a08e35e711b406ce4d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java

  Log Message:
  -----------
  Interim commit.


  Commit: dddb4504d64c9a9ec4c0c13a629448d89b37f75c
      https://github.com/Evolveum/midpoint/commit/dddb4504d64c9a9ec4c0c13a629448d89b37f75c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java

  Log Message:
  -----------
  RuleBasedAspect for assignments.


  Commit: 4500806c3b526a1a5970a1af8ae09b0c35c83e15
      https://github.com/Evolveum/midpoint/commit/4500806c3b526a1a5970a1af8ae09b0c35c83e15
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.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/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.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/PolyStringDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/XmlGregorianCalendarSerializer.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/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack-old.json
    M infra/prism/src/test/resources/common/json/user-jack-v1.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/json/user-will.json
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/src/test/resources/common/yaml/user-will.yaml
    M infra/prism/testng-unit.xml
    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/projector/AssignmentProcessor.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/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/rbac/role-immutable.xml
    A model/model-intest/src/test/resources/rbac/role-non-assignable.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/policy-based-approvals


  Commit: 85f3ca3f1f8a29016224018c51905899cda4450b
      https://github.com/Evolveum/midpoint/commit/85f3ca3f1f8a29016224018c51905899cda4450b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  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/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/policy-based-approvals


  Commit: 85a42a8d9a2b286e521851c635a9b569ec4d5043
      https://github.com/Evolveum/midpoint/commit/85a42a8d9a2b286e521851c635a9b569ec4d5043
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.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/context/EvaluatedPolicyRuleTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java

  Log Message:
  -----------
  RuleBasedAspect working with object modification rules - at least in theory.


  Commit: 15215a73220d56167fdf0b4a53601f1e3b320603
      https://github.com/Evolveum/midpoint/commit/15215a73220d56167fdf0b4a53601f1e3b320603
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java

  Log Message:
  -----------
  Fixed null values in legacy approval aspects.


  Commit: 53e1c8687d144e166d65bc0f0ccc7923aeb138f2
      https://github.com/Evolveum/midpoint/commit/53e1c8687d144e166d65bc0f0ccc7923aeb138f2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.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/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.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/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.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/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    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/AbstractAdTest.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/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  First "policy rule" wf test almost working.


  Commit: a975257bc5b66831e70aa3b703729393f9b8a0ab
      https://github.com/Evolveum/midpoint/commit/a975257bc5b66831e70aa3b703729393f9b8a0ab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java

  Log Message:
  -----------
  The test is now passing. BEWARE: changed roleMembershipRef to contain relation as well.


  Commit: 347683e3c25fa9db3d1435d3e3f5ca5a2efa6ac8
      https://github.com/Evolveum/midpoint/commit/347683e3c25fa9db3d1435d3e3f5ca5a2efa6ac8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java

  Log Message:
  -----------
  Qualifying relations when storing into roleMembershipRef.


  Commit: ee5e2b3a594cbdf0771e50ea695c0491cda69b02
      https://github.com/Evolveum/midpoint/commit/ee5e2b3a594cbdf0771e50ea695c0491cda69b02
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Legacy WF tests pass again.


  Commit: 5c6ff01a6961d8c9e37dc1e7dec0a93715248da6
      https://github.com/Evolveum/midpoint/commit/5c6ff01a6961d8c9e37dc1e7dec0a93715248da6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Legacy WF tests based both on rule-based aspect and on legacy aspects.


  Commit: 9cd1d7b5991531006cbe7a38a7eab15ff4bdf6ae
      https://github.com/Evolveum/midpoint/commit/9cd1d7b5991531006cbe7a38a7eab15ff4bdf6ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.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/WebComponentUtil.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/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.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/PageAdminFocus.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/component/AssignmentPreviewDialog.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/ObjectDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ItemDeltaItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.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/CredentialsProcessor.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/security/AuthenticationEvaluatorImpl.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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/policy-based-approvals

# Conflicts:
#	model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java


  Commit: e9a3a276420923d0ba5637900e67415fa32f6162
      https://github.com/Evolveum/midpoint/commit/e9a3a276420923d0ba5637900e67415fa32f6162
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.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/plain/TestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml

  Log Message:
  -----------
  Added a couple of other wf tests.


  Commit: adec18d1de01f4271832a5a17d1a51e8eeceaa71
      https://github.com/Evolveum/midpoint/commit/adec18d1de01f4271832a5a17d1a51e8eeceaa71
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    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/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml

  Log Message:
  -----------
  Some deputy tests. Interim commit.


  Commit: 0b6e72a5338470c01657dc51b37ffbf2ae2d1253
      https://github.com/Evolveum/midpoint/commit/0b6e72a5338470c01657dc51b37ffbf2ae2d1253
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.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/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml

  Log Message:
  -----------
  More wf tests. Attempt to dynamically resolve wf-related deputies.


  Commit: 8929bc83ce3c591e9933eedf77d14a59cf535c42
      https://github.com/Evolveum/midpoint/commit/8929bc83ce3c591e9933eedf77d14a59cf535c42
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.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/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead10.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml

  Log Message:
  -----------
  Simple deputy tests passing.


  Commit: e73285fec0ab4a97b815a7584a2b4c1d0d7fbc99
      https://github.com/Evolveum/midpoint/commit/e73285fec0ab4a97b815a7584a2b4c1d0d7fbc99
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml

  Log Message:
  -----------
  Few more test roles.


  Commit: 835ad89773d96cb7932092c485e4bcee4dd23af8
      https://github.com/Evolveum/midpoint/commit/835ad89773d96cb7932092c485e4bcee4dd23af8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java

  Log Message:
  -----------
  Repo support for delegatedRef (without migration scripts so far).


  Commit: f7e3befd59170bc69706ca0c1b921b837f2e1003
      https://github.com/Evolveum/midpoint/commit/f7e3befd59170bc69706ca0c1b921b837f2e1003
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/ObjectDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.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/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.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/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    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/NotificationChangeHook.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.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/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    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/AbstractAdTest.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/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  Merge branch 'feature/policy-based-approvals'

# Conflicts:
#	model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java


  Commit: aca397e4ac632022a90d2e67aee28854859ca141
      https://github.com/Evolveum/midpoint/commit/aca397e4ac632022a90d2e67aee28854859ca141
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.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/EvaluatedAssignmentImpl.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/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    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/util/QueryUtils.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java

  Log Message:
  -----------
  Computing delegationRef.


  Commit: 96b1e4c4d49fbe57f8bde1d432cbb8cb3b7ac040
      https://github.com/Evolveum/midpoint/commit/96b1e4c4d49fbe57f8bde1d432cbb8cb3b7ac040
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M model/model-test/pom.xml

  Log Message:
  -----------
  Fixing the build.


  Commit: bdcec92d6854de00052d72cb6b7a1e8a1020a7d1
      https://github.com/Evolveum/midpoint/commit/bdcec92d6854de00052d72cb6b7a1e8a1020a7d1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M infra/prism/pom.xml
    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 infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/report-impl/pom.xml
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Fixed wf tests, this time with (hopefully) final 3.5 version of the wf related schema.


  Commit: 539c5c937330a5fce5dd590dffcc698e1fa66f98
      https://github.com/Evolveum/midpoint/commit/539c5c937330a5fce5dd590dffcc698e1fa66f98
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.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-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

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


  Commit: 8ce8a0f84c744df1e52af843451415f5aa6e91b8
      https://github.com/Evolveum/midpoint/commit/8ce8a0f84c744df1e52af843451415f5aa6e91b8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

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

  Log Message:
  -----------
  Fixing test failures (how we could function with this so far???)


  Commit: 59c2a3ab687f9cbff0a984bb8530b609e6ac0798
      https://github.com/Evolveum/midpoint/commit/59c2a3ab687f9cbff0a984bb8530b609e6ac0798
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  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/assignment/AssignmentCatalogPanel.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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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 infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    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/ModelAuditService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-auditor.xml
    M model/model-test/pom.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:
#	model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java


  Commit: 06100788430a2335a6f831288dde5ec95f4e9696
      https://github.com/Evolveum/midpoint/commit/06100788430a2335a6f831288dde5ec95f4e9696
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Possible fix for deny authorizations (MID-3534)


  Commit: 4815e2542a1f93dd93294768a22120b64587cb71
      https://github.com/Evolveum/midpoint/commit/4815e2542a1f93dd93294768a22120b64587cb71
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/ObjectDelta.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.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-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.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/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.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/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-test/pom.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/NotificationChangeHook.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/pom.xml
    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/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    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/AbstractAdTest.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/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

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


  Commit: e46eae7f9a11f23271df02a97356fa58484fe9aa
      https://github.com/Evolveum/midpoint/commit/e46eae7f9a11f23271df02a97356fa58484fe9aa
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  Delegations panel little changes


  Commit: a4ae342d39fcad49bbba40554cbf8c65747dcc1e
      https://github.com/Evolveum/midpoint/commit/a4ae342d39fcad49bbba40554cbf8c65747dcc1e
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    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/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/ObjectDelta.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.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-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuditService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.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/TestAudit.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/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.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/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    A model/model-intest/src/test/resources/security/role-auditor.xml
    M model/model-test/pom.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/NotificationChangeHook.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/pom.xml
    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/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    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/AbstractAdTest.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/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

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


  Commit: b2781843845041e56a8a452ae88b8fa2d3f1576d
      https://github.com/Evolveum/midpoint/commit/b2781843845041e56a8a452ae88b8fa2d3f1576d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Workflows tests, interim commit.


  Commit: 909f5ed8c1e2b090da77191b8d91f0489097d831
      https://github.com/Evolveum/midpoint/commit/909f5ed8c1e2b090da77191b8d91f0489097d831
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

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


  Commit: 012f4dbc24b433c5b50ee21875fa636c426d06c3
      https://github.com/Evolveum/midpoint/commit/012f4dbc24b433c5b50ee21875fa636c426d06c3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
    M model/workflow-impl/testng-integration.xml

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


  Commit: 92340dc1a55d2a4b057e461e0ce9da99fd985a55
      https://github.com/Evolveum/midpoint/commit/92340dc1a55d2a4b057e461e0ce9da99fd985a55
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  Post-merge fix.


  Commit: 3aeb111cfc1ca9af525678c1f30e5bb11d0899de
      https://github.com/Evolveum/midpoint/commit/3aeb111cfc1ca9af525678c1f30e5bb11d0899de
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml

  Log Message:
  -----------
  wf lifecycle tests - interim commit.


  Commit: c3f7d6c5a3020dc4ea815d13c476c73dade16d35
      https://github.com/Evolveum/midpoint/commit/c3f7d6c5a3020dc4ea815d13c476c73dade16d35
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.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/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    A 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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.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/TestRbac.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Storing assignment effective status (MID-3116)


  Commit: 67b1e6158b1863dca932c3f82c2831fa8186996f
      https://github.com/Evolveum/midpoint/commit/67b1e6158b1863dca932c3f82c2831fa8186996f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java

  Log Message:
  -----------
  Fixing the tests after schema change


  Commit: 8a01d458335f6746f49d8d60443439eabbf55795
      https://github.com/Evolveum/midpoint/commit/8a01d458335f6746f49d8d60443439eabbf55795
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Basic lifecycle tests (modify & delete operation).


  Commit: 0d95a6b62fc60637c9f6c228415e000bab4712be
      https://github.com/Evolveum/midpoint/commit/0d95a6b62fc60637c9f6c228415e000bab4712be
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  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/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  Added authorizations for audit log page and History tab on edit user page


  Commit: 85eb6b5d53edb1dd70ae7e15cea27890e093c533
      https://github.com/Evolveum/midpoint/commit/85eb6b5d53edb1dd70ae7e15cea27890e093c533
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.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/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    A 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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.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/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
    M model/workflow-impl/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: ad6005d523f678389e97e0f4c01594d38deb73ad
      https://github.com/Evolveum/midpoint/commit/ad6005d523f678389e97e0f4c01594d38deb73ad
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.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/LensElementContext.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/TestRbac.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-immutable-global.xml
    A model/model-intest/src/test/resources/rbac/role-non-createable.xml
    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/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Global policy rules - limited to object operations (MID-3538)


  Commit: e2e0cd949852e4a1a2d179f1b52a46339e81b58f
      https://github.com/Evolveum/midpoint/commit/e2e0cd949852e4a1a2d179f1b52a46339e81b58f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.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/global/TestAssignmentApprovalGlobal.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/resources/policy/metarole/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Separation of implicit (org:approver) and explicit (approverRef) assignment tests.


  Commit: bbdc5ba2939e3b4d8e839a5bff07c641f11a9ec5
      https://github.com/Evolveum/midpoint/commit/bbdc5ba2939e3b4d8e839a5bff07c641f11a9ec5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  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/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    A 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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.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/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-immutable-global.xml
    A model/model-intest/src/test/resources/rbac/role-non-createable.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.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/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: 405e62b85f6b182de06148bd20227bd15b22cd7d
      https://github.com/Evolveum/midpoint/commit/405e62b85f6b182de06148bd20227bd15b22cd7d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.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/plain/TestAssignmentApprovalPlainExplicit.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java

  Log Message:
  -----------
  Fixed existing wf tests.


  Commit: 692104a00f20f1daf60eceffc67763fb8f51b832
      https://github.com/Evolveum/midpoint/commit/692104a00f20f1daf60eceffc67763fb8f51b832
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  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/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    A 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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.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/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-immutable-global.xml
    A model/model-intest/src/test/resources/rbac/role-non-createable.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.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/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: 7c95dd952345d814ee6e93a668d2ec7828c2852c
      https://github.com/Evolveum/midpoint/commit/7c95dd952345d814ee6e93a668d2ec7828c2852c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.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/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java

  Log Message:
  -----------
  TestLifecycleGlobal works.


  Commit: cd490037dfa92a960edaa17cdb69a91c5e7607af
      https://github.com/Evolveum/midpoint/commit/cd490037dfa92a960edaa17cdb69a91c5e7607af
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Minor changes.


  Commit: 5b9a623d15fe8ac21cce41aaa6fdd3ea345abb99
      https://github.com/Evolveum/midpoint/commit/5b9a623d15fe8ac21cce41aaa6fdd3ea345abb99
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    R model/workflow-impl/src/test/resources/policy/metarole/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/metarole1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4b.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead10.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml

  Log Message:
  -----------
  Testing approvals defined via metarole.


  Commit: 7d94578654ce13687e831a62693752e5e9e925f8
      https://github.com/Evolveum/midpoint/commit/7d94578654ce13687e831a62693752e5e9e925f8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-26 (Sat, 26 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/metarole-security.xml
    R model/workflow-impl/src/test/resources/policy/metarole1.xml
    A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Testing approval fragments defined via metaroles.


  Commit: 63314d453eb9638e56329f2e10e159261bf2faf7
      https://github.com/Evolveum/midpoint/commit/63314d453eb9638e56329f2e10e159261bf2faf7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.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/ShadowCacheReconciler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

  Log Message:
  -----------
  Fixing delta with empty containers


  Commit: c46838fb366eb17306e2ccc969a40e65be40a188
      https://github.com/Evolveum/midpoint/commit/c46838fb366eb17306e2ccc969a40e65be40a188
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
    A infra/schema/src/test/resources/common/xml/ns/metarole.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml

  Log Message:
  -----------
  Preparation for fixing false triggering of indirect assignments' rules.


  Commit: 4a97202de3302d56a6c4c40e45a74f8965d3933e
      https://github.com/Evolveum/midpoint/commit/4a97202de3302d56a6c4c40e45a74f8965d3933e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.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/ShadowCacheReconciler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: 2b0120b082f108c86e14574ed86b4e2cbebad19b
      https://github.com/Evolveum/midpoint/commit/2b0120b082f108c86e14574ed86b4e2cbebad19b
  Author: Matus M <Matus M>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
    M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
    M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
    M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
    M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
    M samples/resources/scim1/Salesforce/role-group-metarole.xml
    M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
    M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
    M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
    M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
    M samples/resources/scim1/Slack/role-default-slack-account.xml
    M samples/resources/scim1/Slack/role-group-metarole.xml
    M samples/resources/scim1/Slack/systemconfig-slack.xml

  Log Message:
  -----------
  mod to scimV1 samples(Salesforce,Slack)


  Commit: c2ba84caf10b1f4d49457db6ca0f76d590ae1500
      https://github.com/Evolveum/midpoint/commit/c2ba84caf10b1f4d49457db6ca0f76d590ae1500
  Author: Matus M <Matus M>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.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/ShadowCacheReconciler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: 516805361a9fdc7cf4ddc5903f2084d65886a0bc
      https://github.com/Evolveum/midpoint/commit/516805361a9fdc7cf4ddc5903f2084d65886a0bc
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    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/reports/dto/AuditSearchDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java

  Log Message:
  -----------
  reindex task handler.. added new indexed column - itemPath for deltas..


  Commit: 4d5ffa14b5c55fb4a079aa3f65275d6a7af3d6d1
      https://github.com/Evolveum/midpoint/commit/4d5ffa14b5c55fb4a079aa3f65275d6a7af3d6d1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  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/gui/api/util/WebComponentUtil.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/AssignmentEditorDto.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/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    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/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/ObjectDelta.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.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/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.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-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuditService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.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/SystemConfigurationHandler.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    A 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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.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/TestAudit.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/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.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/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-immutable-global.xml
    A model/model-intest/src/test/resources/rbac/role-non-createable.xml
    A model/model-intest/src/test/resources/security/role-auditor.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/model-test/pom.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/NotificationChangeHook.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/pom.xml
    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/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.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/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/metarole1.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role10a.xml
    A model/workflow-impl/src/test/resources/policy/role-role10b.xml
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    A model/workflow-impl/src/test/resources/policy/role-role4a.xml
    A model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml
    A model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    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/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.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/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    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/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
    M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
    M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
    M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
    M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
    M samples/resources/scim1/Salesforce/role-group-metarole.xml
    M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
    M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
    M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
    M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
    M samples/resources/scim1/Slack/role-default-slack-account.xml
    M samples/resources/scim1/Slack/role-group-metarole.xml
    M samples/resources/scim1/Slack/systemconfig-slack.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    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/AbstractAdTest.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/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java


  Commit: d8a59808150daf504e94ca6997faf0e833fa5985
      https://github.com/Evolveum/midpoint/commit/d8a59808150daf504e94ca6997faf0e833fa5985
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java

  Log Message:
  -----------
  audit event record provder after merge


  Commit: 55d661774846cc794eeb348c03166530b586d4c7
      https://github.com/Evolveum/midpoint/commit/55d661774846cc794eeb348c03166530b586d4c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java

  Log Message:
  -----------
  Interim commit.


  Commit: 14bd6346fcdfe2d5c83128866ad8c12c774aa7b3
      https://github.com/Evolveum/midpoint/commit/14bd6346fcdfe2d5c83128866ad8c12c774aa7b3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
    A infra/schema/src/test/resources/common/xml/ns/metarole.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.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/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    A model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/metarole-security.xml
    A model/workflow-impl/src/test/resources/policy/role-role10a.xml
    A model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4a.xml
    A model/workflow-impl/src/test/resources/policy/role-role4b.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead10.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml
    M model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M model/workflow-impl/testng-integration.xml
    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/ShadowCacheReconciler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: 653525e5bb7198963f59edd93ef7e253e4ba98f8
      https://github.com/Evolveum/midpoint/commit/653525e5bb7198963f59edd93ef7e253e4ba98f8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

  Log Message:
  -----------
  updated cleanup scripts for tests


  Commit: 04fc1d4efab76bf81d7fdd947370b939e925cb20
      https://github.com/Evolveum/midpoint/commit/04fc1d4efab76bf81d7fdd947370b939e925cb20
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml

  Log Message:
  -----------
  Metarole+policyRules test


  Commit: 57f3559948ecc8a71c43337c88df8a28f4492da6
      https://github.com/Evolveum/midpoint/commit/57f3559948ecc8a71c43337c88df8a28f4492da6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java

  Log Message:
  -----------
  fixing ID for audit item..


  Commit: 321b2a9dc92b362ea565670a24c347ae7aea1c5f
      https://github.com/Evolveum/midpoint/commit/321b2a9dc92b362ea565670a24c347ae7aea1c5f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

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


  Commit: c53f1150d85b2df4a58c4838bea0a5fc18eb237d
      https://github.com/Evolveum/midpoint/commit/c53f1150d85b2df4a58c4838bea0a5fc18eb237d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    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/reports/dto/AuditSearchDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
    A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
    M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
    M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
    M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
    M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
    M samples/resources/scim1/Salesforce/role-group-metarole.xml
    M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
    M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
    M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
    M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
    M samples/resources/scim1/Slack/role-default-slack-account.xml
    M samples/resources/scim1/Slack/role-group-metarole.xml
    M samples/resources/scim1/Slack/systemconfig-slack.xml

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


  Commit: 8fc6f73e022dc92ec616f80a6558be1608298be2
      https://github.com/Evolveum/midpoint/commit/8fc6f73e022dc92ec616f80a6558be1608298be2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml

  Log Message:
  -----------
  Forgotten file. Sorry.


  Commit: 5d715f0e222c248f49fa38f742d7a297646d6b67
      https://github.com/Evolveum/midpoint/commit/5d715f0e222c248f49fa38f742d7a297646d6b67
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

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

  Log Message:
  -----------
  Typo fix


  Commit: b258679f1b3a85481458263fced6c7d36a49b021
      https://github.com/Evolveum/midpoint/commit/b258679f1b3a85481458263fced6c7d36a49b021
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml

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


  Commit: 80a4124f6eff1a79eee0ef8cea4c5bff0ae60791
      https://github.com/Evolveum/midpoint/commit/80a4124f6eff1a79eee0ef8cea4c5bff0ae60791
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    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/reports/dto/AuditSearchDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.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/ModelPublicConstants.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml
    A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
    A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
    M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
    M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
    M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
    M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
    M samples/resources/scim1/Salesforce/role-group-metarole.xml
    M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
    M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
    M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
    M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
    M samples/resources/scim1/Slack/role-default-slack-account.xml
    M samples/resources/scim1/Slack/role-group-metarole.xml
    M samples/resources/scim1/Slack/systemconfig-slack.xml

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: b769d192b0667b29301e03dd927587716d748321
      https://github.com/Evolveum/midpoint/commit/b769d192b0667b29301e03dd927587716d748321
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql

  Log Message:
  -----------
  updated sql scripts


  Commit: 770e3b3919547be69a4707b3125e5ed5059e5aeb
      https://github.com/Evolveum/midpoint/commit/770e3b3919547be69a4707b3125e5ed5059e5aeb
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  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/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeObjectType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-3544 Approver/owner relation in GUI


  Commit: 2c3666950c0267e3c0bb5a0bbe36aac1f347bd8b
      https://github.com/Evolveum/midpoint/commit/2c3666950c0267e3c0bb5a0bbe36aac1f347bd8b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    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/reports/dto/AuditSearchDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.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/ModelPublicConstants.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml
    A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
    A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
    M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
    M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
    M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
    M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
    M samples/resources/scim1/Salesforce/role-group-metarole.xml
    M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
    M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
    M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
    M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
    M samples/resources/scim1/Slack/role-default-slack-account.xml
    M samples/resources/scim1/Slack/role-group-metarole.xml
    M samples/resources/scim1/Slack/systemconfig-slack.xml

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


  Commit: 66ce2cb0551cf1575be4e5b4bb0921103c1728c8
      https://github.com/Evolveum/midpoint/commit/66ce2cb0551cf1575be4e5b4bb0921103c1728c8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

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

  Log Message:
  -----------
  audit cleanup implementation fixed


  Commit: 576e88ca3a239ea444349d493c7822172f58b5b6
      https://github.com/Evolveum/midpoint/commit/576e88ca3a239ea444349d493c7822172f58b5b6
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java

  Log Message:
  -----------
  hided Projections tab on the user history page


  Commit: 7cf209854cecdd400b1ddca0c7aea33126875675
      https://github.com/Evolveum/midpoint/commit/7cf209854cecdd400b1ddca0c7aea33126875675
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

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

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


  Commit: d03667b017526756e687551023f87bfbdee8ce80
      https://github.com/Evolveum/midpoint/commit/d03667b017526756e687551023f87bfbdee8ce80
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-intest/src/test/resources/rbac/role-non-assignable.xml

  Log Message:
  -----------
  When collecting policy rules, apply order constraints.


  Commit: 9aa24eddd1340fb9e8c68e7e0dcf0a0f79e4ee4a
      https://github.com/Evolveum/midpoint/commit/9aa24eddd1340fb9e8c68e7e0dcf0a0f79e4ee4a
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.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/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java

  Log Message:
  -----------
  added Delegated to me tab to user history page


  Commit: 8ce165d9ffae791102239a3ed212d52bed6fbe61
      https://github.com/Evolveum/midpoint/commit/8ce165d9ffae791102239a3ed212d52bed6fbe61
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Differentiating focus vs target policy rules


  Commit: 21747082aca894c35e1ceeae8ff937fb8faaf0d7
      https://github.com/Evolveum/midpoint/commit/21747082aca894c35e1ceeae8ff937fb8faaf0d7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-intest/src/test/resources/rbac/role-non-assignable.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: 68f83eb37d2468a2c16a719709560bc823eca1b5
      https://github.com/Evolveum/midpoint/commit/68f83eb37d2468a2c16a719709560bc823eca1b5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    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/EvaluationOrderImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    A model/model-impl/src/test/resources/lens/role-corp-auth.xml
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml

  Log Message:
  -----------
  Preparation for "induced authorizations" test.


  Commit: 362dc694854d5e7592b91426b0d1d2832e2027ac
      https://github.com/Evolveum/midpoint/commit/362dc694854d5e7592b91426b0d1d2832e2027ac
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Configurable default approval rules


  Commit: e4babbb86d9d3dc515100bd22d89027f5d5ac810
      https://github.com/Evolveum/midpoint/commit/e4babbb86d9d3dc515100bd22d89027f5d5ac810
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

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

  Log Message:
  -----------
  mariadb support


  Commit: 0e90d4ab0fb870d8f987c6b6f2ace4cb202a5ca8
      https://github.com/Evolveum/midpoint/commit/0e90d4ab0fb870d8f987c6b6f2ace4cb202a5ca8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  mariadb jdbc driver bundled


  Commit: 3d22caf6c67f2d641b156aaad7ab716c450bc1c9
      https://github.com/Evolveum/midpoint/commit/3d22caf6c67f2d641b156aaad7ab716c450bc1c9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-intest/src/test/resources/rbac/role-non-assignable.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/resources/policy/metarole-default.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml

  Log Message:
  -----------
  Differentiating between "target policy rules" and "this target policy rules".


  Commit: e133265f1aafad81be5e7f27a138995a1dcf7872
      https://github.com/Evolveum/midpoint/commit/e133265f1aafad81be5e7f27a138995a1dcf7872
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java

  Log Message:
  -----------
  Fixing some tests, e.g. related to processing membership info from induced roles of wrong order.


  Commit: a6063c2d66a6f978fb160f3eee08dc7e02b7bb22
      https://github.com/Evolveum/midpoint/commit/a6063c2d66a6f978fb160f3eee08dc7e02b7bb22
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    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/EvaluatedAssignmentImpl.java

  Log Message:
  -----------
  Fixed handling of legacy assignment-related policy rules.


  Commit: e6c31c84e117c4e9a51169261eba603190f5b331
      https://github.com/Evolveum/midpoint/commit/e6c31c84e117c4e9a51169261eba603190f5b331
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/pom.xml
    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/assignment/AssignmentEditorDto.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/DelegationEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.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/dto/DefinitionScopeObjectType.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/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/resources/localization/Midpoint.properties
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M tools/repo-ninja/pom.xml

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


  Commit: bebd5725096c7821d4e06575c34082075f4e75ee
      https://github.com/Evolveum/midpoint/commit/bebd5725096c7821d4e06575c34082075f4e75ee
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java

  Log Message:
  -----------
  Disabled obsolete prism test (normalize() on empty PCVs)


  Commit: 8389396faaea894f5b58022cc0fb49bf00a762e4
      https://github.com/Evolveum/midpoint/commit/8389396faaea894f5b58022cc0fb49bf00a762e4
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  small fix for delegations


  Commit: 565ed8df9ded087688d7d9a63277219e9e56c5c4
      https://github.com/Evolveum/midpoint/commit/565ed8df9ded087688d7d9a63277219e9e56c5c4
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
    A infra/schema/src/test/resources/common/xml/ns/metarole.xml
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.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/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.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/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    A model/model-impl/src/test/resources/lens/role-corp-auth.xml
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/metarole-security.xml
    R model/workflow-impl/src/test/resources/policy/metarole1.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M tools/repo-ninja/pom.xml

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


  Commit: a18fb5e2f94fd2bbf5549dd24af95aea7e50f598
      https://github.com/Evolveum/midpoint/commit/a18fb5e2f94fd2bbf5549dd24af95aea7e50f598
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

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

  Log Message:
  -----------
  cleanup fix for sql server


  Commit: de8ff4d67725806d588197e3829eda4af3212e1f
      https://github.com/Evolveum/midpoint/commit/de8ff4d67725806d588197e3829eda4af3212e1f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml

  Log Message:
  -----------
  approverRef in ApprovalPolicyActionType


  Commit: f1e4b3630919072690691867ef3dab714a85db3c
      https://github.com/Evolveum/midpoint/commit/f1e4b3630919072690691867ef3dab714a85db3c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

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


  Commit: 849134246aa167c6db9f33d5bf53085f7a6511f5
      https://github.com/Evolveum/midpoint/commit/849134246aa167c6db9f33d5bf53085f7a6511f5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Upgrade of Activiti and Quartz Scheduler.


  Commit: 416245100e529e8fd31374f1df33cd68c9473660
      https://github.com/Evolveum/midpoint/commit/416245100e529e8fd31374f1df33cd68c9473660
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/AuditLogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java

  Log Message:
  -----------
  fixed returning back to PageAuditLogDetails


  Commit: 56132f2d2d3295b0974531b2372868d9a28820de
      https://github.com/Evolveum/midpoint/commit/56132f2d2d3295b0974531b2372868d9a28820de
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

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


  Commit: d401d2cdd4e2b3ac8cc0a0ebf6004974c7a13943
      https://github.com/Evolveum/midpoint/commit/d401d2cdd4e2b3ac8cc0a0ebf6004974c7a13943
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java

  Log Message:
  -----------
  Allowing JSON/YAML bulk actions.


  Commit: 07cc29c8df02fde1f7e656e8372ad0d061be57df
      https://github.com/Evolveum/midpoint/commit/07cc29c8df02fde1f7e656e8372ad0d061be57df
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/AuditLogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java

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


  Commit: 2793a574160b1dca89a2c8036e5a2a5e9e32245c
      https://github.com/Evolveum/midpoint/commit/2793a574160b1dca89a2c8036e5a2a5e9e32245c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterStatusInformation.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

  Log Message:
  -----------
  Task execution constraints - interim commit.


  Commit: d36b5ca3221af0ba66bd550f8fb6d875fc0cd116
      https://github.com/Evolveum/midpoint/commit/d36b5ca3221af0ba66bd550f8fb6d875fc0cd116
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    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/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Deputy styles (css/less)


  Commit: b998585b32550de8a2dac2749877298012098fef
      https://github.com/Evolveum/midpoint/commit/b998585b32550de8a2dac2749877298012098fef
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java

  Log Message:
  -----------
  MID-3479 fix, couldn't grep any other onfocus


  Commit: af2da4d8b0b78289fd7dd4605680b6050e2b08ac
      https://github.com/Evolveum/midpoint/commit/af2da4d8b0b78289fd7dd4605680b6050e2b08ac
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    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/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/AuditLogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml

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


  Commit: 826659c0c60372e9aba173dd30b7788fa5371432
      https://github.com/Evolveum/midpoint/commit/826659c0c60372e9aba173dd30b7788fa5371432
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    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/execution/JobExecutor.java

  Log Message:
  -----------
  Task execution constraints. Interim commit.


  Commit: 3e07494e5548036ff9e1f07dd3394a3c79c8ee00
      https://github.com/Evolveum/midpoint/commit/3e07494e5548036ff9e1f07dd3394a3c79c8ee00
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    A repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockLongTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    A repo/task-quartz-impl/src/test/resources/repo/task-110GroupLimit-2.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-110GroupLimit.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-120NodeAllowed.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-130NodeNotAllowed.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-140NodeDisallowed.xml

  Log Message:
  -----------
  MID-2925 (limiting # of parallel tasks) and very rough attempt at MID-3323 (specification of execution node).


  Commit: 4d36ff20ca50e31e57c76187266946e37aa046b1
      https://github.com/Evolveum/midpoint/commit/4d36ff20ca50e31e57c76187266946e37aa046b1
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    A samples/bulk/assignRoleWithActivationToUser.xml
    A samples/bulk/assignRoleWithActivationToUser.yaml
    A samples/bulk/assignRoleWithActivationToUsersWithSequences.xml

  Log Message:
  -----------
  sample bulk actions in xml and yaml


  Commit: 002fb1249d94604a6b26b7ed26e4bb98857ede4e
      https://github.com/Evolveum/midpoint/commit/002fb1249d94604a6b26b7ed26e4bb98857ede4e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    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/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    A samples/bulk/assignRoleWithActivationToUser.xml
    A samples/bulk/assignRoleWithActivationToUser.yaml
    A samples/bulk/assignRoleWithActivationToUsersWithSequences.xml

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


  Commit: 0437d8ac8a0c47204c767405076242bcdf58757a
      https://github.com/Evolveum/midpoint/commit/0437d8ac8a0c47204c767405076242bcdf58757a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java

  Log Message:
  -----------
  test-samples: skip (no-xmlns) "bulk" directory


  Commit: 018df07c0877bbdbd57a79281813b993388a979e
      https://github.com/Evolveum/midpoint/commit/018df07c0877bbdbd57a79281813b993388a979e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/resources/common/org-monkey-island.xml
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    M model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/common/role-empty.xml
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/model-intest/src/test/resources/common/role-red-sailor.xml

  Log Message:
  -----------
  Limiting unlimited delegation only to delegable roles (MID-3550)


  Commit: 3394499066d5845bb05b781e444ae2bcc231f030
      https://github.com/Evolveum/midpoint/commit/3394499066d5845bb05b781e444ae2bcc231f030
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M repo/task-quartz-impl/pom.xml
    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/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/RemoteNodesManager.java

  Log Message:
  -----------
  Cluster node limitations (untested, may or may not work).


  Commit: f846b0c30d34c9972d86cccf1aa47335a825ec16
      https://github.com/Evolveum/midpoint/commit/f846b0c30d34c9972d86cccf1aa47335a825ec16
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    A config/sql/_all/postgresql-upgrade-3.4-3.5.sql
    M repo/task-quartz-impl/pom.xml

  Log Message:
  -----------
  Quartz and Activiti upgrade scripts (PostgreSQL)


  Commit: ad447fe1b76878043b87ba5ed7366b3bf708d575
      https://github.com/Evolveum/midpoint/commit/ad447fe1b76878043b87ba5ed7366b3bf708d575
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/resources/common/org-monkey-island.xml
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    M model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/common/role-empty.xml
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/model-intest/src/test/resources/common/role-red-sailor.xml

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


  Commit: c03bafe0f8eeb84f599076b7fa20976d566fa10a
      https://github.com/Evolveum/midpoint/commit/c03bafe0f8eeb84f599076b7fa20976d566fa10a
  Author: honchar <honchar at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java

  Log Message:
  -----------
  small fixes for Delegations


  Commit: 72748db4efa15959a8757d3abfb25afbd65b1d56
      https://github.com/Evolveum/midpoint/commit/72748db4efa15959a8757d3abfb25afbd65b1d56
  Author: honchar <honchar at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    A config/sql/_all/postgresql-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.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/context/AssignmentPathSegment.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/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/resources/common/org-monkey-island.xml
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    M model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/common/role-empty.xml
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/model-intest/src/test/resources/common/role-red-sailor.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.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/ClusterStatusInformation.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/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/RemoteNodesManager.java
    A repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockLongTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    A repo/task-quartz-impl/src/test/resources/repo/task-110GroupLimit-2.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-110GroupLimit.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-120NodeAllowed.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-130NodeNotAllowed.xml
    A repo/task-quartz-impl/src/test/resources/repo/task-140NodeDisallowed.xml
    A samples/bulk/assignRoleWithActivationToUser.xml
    A samples/bulk/assignRoleWithActivationToUser.yaml
    A samples/bulk/assignRoleWithActivationToUsersWithSequences.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java

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


  Commit: e5faeabd15956307f33ac07d93f0a2ad2d3d38ab
      https://github.com/Evolveum/midpoint/commit/e5faeabd15956307f33ac07d93f0a2ad2d3d38ab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.engine.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

  Log Message:
  -----------
  Updated initial SQL scripts for Activiti and Quartz (all DBs).


  Commit: 7df54399ddec64dd88f365be8e400974b4ba0cbb
      https://github.com/Evolveum/midpoint/commit/7df54399ddec64dd88f365be8e400974b4ba0cbb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java

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


  Commit: 2806f798f0ca468218d8ccded7559bc36668ae5b
      https://github.com/Evolveum/midpoint/commit/2806f798f0ca468218d8ccded7559bc36668ae5b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    A config/sql/_all/oracle-upgrade-3.4-3.5.sql

  Log Message:
  -----------
  Quartz and Activiti upgrade scripts (Oracle)


  Commit: 8eab83b88db74e7d4c4b7731edaae1b886bf988b
      https://github.com/Evolveum/midpoint/commit/8eab83b88db74e7d4c4b7731edaae1b886bf988b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    R config/sql/_all/h2-upgrade-3.3-3.4.1.sql
    A config/sql/_all/h2-upgrade-3.4-3.5.sql
    R config/sql/_all/mysql-upgrade-3.3-3.4.1.sql
    A config/sql/_all/mysql-upgrade-3.4-3.5.sql
    R config/sql/_all/oracle-upgrade-3.3-3.4.1.sql
    R config/sql/_all/postgresql-upgrade-3.3-3.4.1.sql
    R config/sql/_all/sqlserver-upgrade-3.3-3.4.1.sql
    A config/sql/_all/sqlserver-upgrade-3.4-3.5.sql
    R config/sql/_all/upgrade-3.4-3.4.1-readme.txt

  Log Message:
  -----------
  Quartz and Activiti upgrade scripts (remaining DBs - MySQL, SQL Server)


  Commit: 19a2368ab463206a069921a4a10585611e65bb66
      https://github.com/Evolveum/midpoint/commit/19a2368ab463206a069921a4a10585611e65bb66
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    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

  Log Message:
  -----------
  Updated quartz init scripts that are used for repo initialization.


  Commit: 2894e8ff29bafb8a44d3c46665011df1815a7196
      https://github.com/Evolveum/midpoint/commit/2894e8ff29bafb8a44d3c46665011df1815a7196
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M model/model-intest/src/test/resources/orgstruct/org-caribbean.xml
    M model/model-intest/src/test/resources/security/role-delegator.xml

  Log Message:
  -----------
  Fixing the tests


  Commit: 26276be557eeab32af085a1c208e7536c06a26a5
      https://github.com/Evolveum/midpoint/commit/26276be557eeab32af085a1c208e7536c06a26a5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java

  Log Message:
  -----------
  Grammar nazi in action


  Commit: 5d6582b575d4f95950dfb8e912e3990e9d0f296c
      https://github.com/Evolveum/midpoint/commit/5d6582b575d4f95950dfb8e912e3990e9d0f296c
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.4-3.5.sql

  Log Message:
  -----------
  fix oracle syntax


  Commit: 1f4f2dc68acc18f7b1921e56fd00787f188093be
      https://github.com/Evolveum/midpoint/commit/1f4f2dc68acc18f7b1921e56fd00787f188093be
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  Audit/history stylesheets (part 1)


  Commit: d6b85adbef16414269d149c3a5cc750d748b7053
      https://github.com/Evolveum/midpoint/commit/d6b85adbef16414269d149c3a5cc750d748b7053
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java

  Log Message:
  -----------
  Object history stylesheet improvement (MID-3546)


  Commit: d572e1ec2100d91ae3ebd1afd7256c0e9d958187
      https://github.com/Evolveum/midpoint/commit/d572e1ec2100d91ae3ebd1afd7256c0e9d958187
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/ActivitiEngine.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/ActivitiInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.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/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfProcessInstanceShadowTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java

  Log Message:
  -----------
  Better exception logging in workflow-impl


  Commit: 72cebf52f03acd51b87a3f781b6873534d1421c2
      https://github.com/Evolveum/midpoint/commit/72cebf52f03acd51b87a3f781b6873534d1421c2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M model/model-intest/src/test/resources/orgstruct/org-caribbean.xml
    M model/model-intest/src/test/resources/security/role-delegator.xml

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


  Commit: 03be12859e5d61eb443bfe9c056c0a1bd58fd072
      https://github.com/Evolveum/midpoint/commit/03be12859e5d61eb443bfe9c056c0a1bd58fd072
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/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/JobExecutor.java
    A repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobStarter.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/RemoteNodesManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/StalledTasksWatcher.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/NoOpTaskHandler.java

  Log Message:
  -----------
  MID-2925 & MID-3323

Better handling of waiting due to execution constraints: fixed triggers leaks.
Correctly dealing with non-standard Quartz triggers (execution constraints, 'run now') on suspend and sync.
Better re-scheduling tasks to suitable nodes (although still not 100% guaranteed).
Better exception logging in task-quartz-impl module.


  Commit: ed95d47a56ce7f1df79b94a13ba043db195defb8
      https://github.com/Evolveum/midpoint/commit/ed95d47a56ce7f1df79b94a13ba043db195defb8
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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 infra/schema/src/main/resources/localization/schema_et.properties

  Log Message:
  -----------
  Merge branch 'transifex'


Compare: https://github.com/Evolveum/midpoint/compare/995fbd962d65...ed95d47a56ce