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

Pavol Mederly mederly at evolveum.com
Mon Mar 6 21:15:45 CET 2017


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


Compare: https://github.com/Evolveum/midpoint/compare/2964b1994b13...291b132a296a


More information about the midPoint-svn mailing list