[midPoint-git] [Evolveum/midpoint] 0b5c7d: "includeAction" process specification parameter + ...

[Katarina Valalikova]

  Branch: refs/heads/feature/functions
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0b5c7d7445b96443b480bd22ea8d7a2b236c137a
      https://github.com/Evolveum/midpoint/commit/0b5c7d7445b96443b480bd22ea8d7a2b236c137a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.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/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
    A model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml

  Log Message:
  -----------
  "includeAction" process specification parameter + related tests.


  Commit: e6c41b5fa084a8b144a8ace39676c93151efba4f
      https://github.com/Evolveum/midpoint/commit/e6c41b5fa084a8b144a8ace39676c93151efba4f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

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

  Log Message:
  -----------
  Password policies: prohibitedValues schema (MID-4063)


  Commit: 90a7dea36c38d99b0fc7946dec2d972cca092efc
      https://github.com/Evolveum/midpoint/commit/90a7dea36c38d99b0fc7946dec2d972cca092efc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    A model/model-intest/src/test/resources/rbac/resource-dummy-focus-exists.xml

  Log Message:
  -----------
  New test for MID-4198 (failing, disabled).


  Commit: 4d43befdc1b331c9e176b31f0584b345594a9071
      https://github.com/Evolveum/midpoint/commit/4d43befdc1b331c9e176b31f0584b345594a9071
  Author: kate <honchar at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java

  Log Message:
  -----------
  add new multivalue container value


  Commit: 1db4f676a509b5b947a3bcfab175ec506921162a
      https://github.com/Evolveum/midpoint/commit/1db4f676a509b5b947a3bcfab175ec506921162a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  MID-4180 operation result hook, work in progress


  Commit: aa2ff31292f36de30cb99d6187adb026fcf2c82e
      https://github.com/Evolveum/midpoint/commit/aa2ff31292f36de30cb99d6187adb026fcf2c82e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    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-policy-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    A model/model-intest/src/test/resources/rbac/resource-dummy-focus-exists.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.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/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
    A model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml

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


  Commit: 1f262dd8afe40deacad0f2b3612cfc4cfd9263af
      https://github.com/Evolveum/midpoint/commit/1f262dd8afe40deacad0f2b3612cfc4cfd9263af
  Author: kate <honchar at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java

  Log Message:
  -----------
  add new multivalue container value


  Commit: 1b02c6a1fe9ccbce70874f1ad88f773b618e156c
      https://github.com/Evolveum/midpoint/commit/1b02c6a1fe9ccbce70874f1ad88f773b618e156c
  Author: kate <honchar at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.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-policy-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    A model/model-intest/src/test/resources/rbac/resource-dummy-focus-exists.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.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/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
    A model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml

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


  Commit: 5c555a5fab71a951278cf3124cbc3abaf255b985
      https://github.com/Evolveum/midpoint/commit/5c555a5fab71a951278cf3124cbc3abaf255b985
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.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-policy-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    A model/model-intest/src/test/resources/rbac/resource-dummy-focus-exists.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.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/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestParallelApprovals.java
    A model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java


Compare: https://github.com/Evolveum/midpoint/compare/c090c9f09313...5c555a5fab71