[midPoint-git] [Evolveum/midpoint] 2cc43c: Storing policy triggers in assignments (preliminar...

[Radovan Semancik]

  Branch: refs/heads/feature/password-hash
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2cc43c60af45d105a371241d01986d9b80ca647b
      https://github.com/Evolveum/midpoint/commit/2cc43c60af45d105a371241d01986d9b80ca647b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.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 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/EvaluatedPolicyRuleTrigger.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/PolicyRuleProcessor.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/testng-unit.xml

  Log Message:
  -----------
  Storing policy triggers in assignments (preliminary version).


  Commit: 8d15793846e8b864bdd8eed8cab394ddcf780f25
      https://github.com/Evolveum/midpoint/commit/8d15793846e8b864bdd8eed8cab394ddcf780f25
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.xml

  Log Message:
  -----------
  Enhanced test with 3-way exclusion.


  Commit: 18dcf96cedf7116f9cc672d8530c78c891a29e28
      https://github.com/Evolveum/midpoint/commit/18dcf96cedf7116f9cc672d8530c78c891a29e28
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml

  Log Message:
  -----------
  Conflicting objects in certification GUI (SoD certification).


  Commit: 06b423572516c27a17b97723b8a5d756e1dc1367
      https://github.com/Evolveum/midpoint/commit/06b423572516c27a17b97723b8a5d756e1dc1367
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java

  Log Message:
  -----------
  Fixed schema tests.


  Commit: c77731ff73bb6c8e5cbc0485d04c6e6907eb2634
      https://github.com/Evolveum/midpoint/commit/c77731ff73bb6c8e5cbc0485d04c6e6907eb2634
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml

  Log Message:
  -----------
  Two ugly hacks for unmarshalling (TODO: clean that out!)


  Commit: 9c5a2edecefb6077e654a0be3a10e2c66c1c6bbf
      https://github.com/Evolveum/midpoint/commit/9c5a2edecefb6077e654a0be3a10e2c66c1c6bbf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml

  Log Message:
  -----------
  Fixing schema tests.


  Commit: e15fa588485068a879d831ff774854d08094986d
      https://github.com/Evolveum/midpoint/commit/e15fa588485068a879d831ff774854d08094986d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml

  Log Message:
  -----------
  More serious implementation of Saturday's prism hacks.


  Commit: 9091be743d26fe643b3036d832512844bdab167a
      https://github.com/Evolveum/midpoint/commit/9091be743d26fe643b3036d832512844bdab167a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.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/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Writing tests for MID-3799:4 (wrong messages when auto-rejecting work items). In progress.


  Commit: 7a5039926e0730e4820fc814e10c67553c4b6e15
      https://github.com/Evolveum/midpoint/commit/7a5039926e0730e4820fc814e10c67553c4b6e15
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/parser/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.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/EvaluatedPolicyRuleTrigger.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/PolicyRuleProcessor.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/testng-unit.xml
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml

  Log Message:
  -----------
  Merge branch 'feature/sod-certification'


  Commit: 82421c232458dcaa17c67fd15a357220dda6d1f2
      https://github.com/Evolveum/midpoint/commit/82421c232458dcaa17c67fd15a357220dda6d1f2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java

  Log Message:
  -----------
  Fixed double removal of already executed triggers.


  Commit: a63e0fa8361ab627b0a3927408e63f623dbf61db
      https://github.com/Evolveum/midpoint/commit/a63e0fa8361ab627b0a3927408e63f623dbf61db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  When multiple work items are cancelled by timed actions at once (approximately), all of them are marked as completed.
(Internally, only one is completed. All the others are usually cancelled.)


  Commit: 291b132a296a7b3269544ae5668e2c6e845b4367
      https://github.com/Evolveum/midpoint/commit/291b132a296a7b3269544ae5668e2c6e845b4367
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

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


  Commit: a0e1e51ef1852397d7180cb28c1a523167b2c777
      https://github.com/Evolveum/midpoint/commit/a0e1e51ef1852397d7180cb28c1a523167b2c777
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M repo/repo-test-util/pom.xml

  Log Message:
  -----------
  Added missing dependency.


  Commit: f29db26ffb1a5233f8b25bea10ba4f8fe924cec6
      https://github.com/Evolveum/midpoint/commit/f29db26ffb1a5233f8b25bea10ba4f8fe924cec6
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

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

  Log Message:
  -----------
  some work for configurable columns


  Commit: 6c33c93c2a6aa153f688bfcbe0fabfe103c39853
      https://github.com/Evolveum/midpoint/commit/6c33c93c2a6aa153f688bfcbe0fabfe103c39853
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.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/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

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


  Commit: 65e80f9e557498253fa08d15102d41e6d9eb8918
      https://github.com/Evolveum/midpoint/commit/65e80f9e557498253fa08d15102d41e6d9eb8918
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  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_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties

  Log Message:
  -----------
  New and updated translations.
Cudos to Transifex contributors: petr.gasparik (cs), AivoK (et), wstaszewski (pl), carlos18619 (pt_BR), OlgaMirsanova (ru). Thank you!


  Commit: 59a04ece68b0374b9f65974a55f72294c147f539
      https://github.com/Evolveum/midpoint/commit/59a04ece68b0374b9f65974a55f72294c147f539
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java

  Log Message:
  -----------
  Increased timeout for task test 016.


  Commit: 2536d73a674335dc768cef3dac453df6f8af3a84
      https://github.com/Evolveum/midpoint/commit/2536d73a674335dc768cef3dac453df6f8af3a84
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.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-certification-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/LensOwnerResolver.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/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/LinkAction.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M 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 tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  asPrismObject() method now returns parametrized PrismObject (either <? extends X> or <X>)


  Commit: 861aa3c69a294af13765af617b460c60d1b15d28
      https://github.com/Evolveum/midpoint/commit/861aa3c69a294af13765af617b460c60d1b15d28
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemAllocationChangeOperationInfo.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationInfo.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationSourceInfo.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Cleaned-up workflow notifications (API and SimpleWorktlowNotifier).


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

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

  Log Message:
  -----------
  Fixing adminGuiConfig column schema


  Commit: 545f0e45234fee0ec155d82820ebfcbc501a5ef3
      https://github.com/Evolveum/midpoint/commit/545f0e45234fee0ec155d82820ebfcbc501a5ef3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


  Commit: 43fc70831fd22e41099371d9be2dd81eae4592dc
      https://github.com/Evolveum/midpoint/commit/43fc70831fd22e41099371d9be2dd81eae4592dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

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

  Log Message:
  -----------
  Showing completion on timeout in the GUI (MID-3799:4).


  Commit: 1bc285f14c872839384d7a4afc400a7fa046dc52
      https://github.com/Evolveum/midpoint/commit/1bc285f14c872839384d7a4afc400a7fa046dc52
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml

  Log Message:
  -----------
  Support for multiple check expressions in the value policy (MID-1657)


  Commit: b0e0fa0014a8be92bc88f4c704f3ce864846e901
      https://github.com/Evolveum/midpoint/commit/b0e0fa0014a8be92bc88f4c704f3ce864846e901
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java

  Log Message:
  -----------
  more work for configurable columns
refactoring of old column initialization


  Commit: 13cacd4114369dc205539dbc1023b219d6da3c98
      https://github.com/Evolveum/midpoint/commit/13cacd4114369dc205539dbc1023b219d6da3c98
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M 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_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/LensOwnerResolver.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/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/LinkAction.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemAllocationChangeOperationInfo.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationInfo.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationSourceInfo.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.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/TestStrings.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

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


  Commit: 62581da635c4e5926465e09265899e0a5fd2ae04
      https://github.com/Evolveum/midpoint/commit/62581da635c4e5926465e09265899e0a5fd2ae04
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  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/ChangeExecutor.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml

  Log Message:
  -----------
  support for condition in provisionign scripts


  Commit: 64d75e7fb208fad214e4b176b587493f8389f7cd
      https://github.com/Evolveum/midpoint/commit/64d75e7fb208fad214e4b176b587493f8389f7cd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M 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_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-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/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
    M infra/schema/src/test/resources/common/json/ns/user-jack.json
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
    M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-2c.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/EvaluatedPolicyRuleTrigger.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/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/ChangeExecutor.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/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensOwnerResolver.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/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/LinkAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
    M model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/resources/common/password-policy-global.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemAllocationChangeOperationInfo.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationInfo.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationSourceInfo.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration.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/ResourceManager.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-2c.xml
    M samples/certification/sod/sod-certification.xml
    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/TestStrings.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge branch 'master' into feature/password-hash


Compare: https://github.com/Evolveum/midpoint/compare/ed2f7f04e94f...64d75e7fb208