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

[Pavol Mederly]

  Branch: refs/heads/master
  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


Compare: https://github.com/Evolveum/midpoint/compare/dd863e7572e4...59c2a3ab687f