[midPoint-git] [Evolveum/midpoint] 091443: object collections settings are applied on the rol...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 09144319ddbae1ffd8306ba49c45126e1ef3e356
      https://github.com/Evolveum/midpoint/commit/09144319ddbae1ffd8306ba49c45126e1ef3e356
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java

  Log Message:
  -----------
  object collections settings are applied on the role catalog page


  Commit: 27487ef0893f2dd0e74c323c3975eaf964319839
      https://github.com/Evolveum/midpoint/commit/27487ef0893f2dd0e74c323c3975eaf964319839
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    R infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUserJson.java
    A infra/schema/src/test/resources/diff/campaign-1.xml
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/repo/json/policy-generate-bad-path.json
    A testing/rest/src/test/resources/repo/json/policy-generate-execute.json
    A testing/rest/src/test/resources/repo/json/policy-generate.json
    A testing/rest/src/test/resources/repo/json/policy-validate-explicit-conflict.json
    A testing/rest/src/test/resources/repo/json/policy-validate-explicit.json
    A testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi-conflict.json
    A testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi.json
    A testing/rest/src/test/resources/repo/json/policy-validate-implicit-single.json
    M testing/rest/src/test/resources/repo/json/user-darthadder.json
    M testing/rest/src/test/resources/repo/system-configuration.xml
    A testing/rest/src/test/resources/repo/value-policy-general.xml
    A testing/rest/src/test/resources/repo/value-policy-numeric.xml
    A testing/rest/src/test/resources/repo/xml/policy-generate-bad-path.xml
    A testing/rest/src/test/resources/repo/xml/policy-generate-execute.xml
    A testing/rest/src/test/resources/repo/xml/policy-generate.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-explicit-conflict.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-explicit.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi-conflict.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-implicit-single.xml
    M testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/yaml/policy-generate-bad-path.yml
    A testing/rest/src/test/resources/repo/yaml/policy-generate-execute.yml
    A testing/rest/src/test/resources/repo/yaml/policy-generate.yml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-explicit-conflict.yml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-explicit.yml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-multi-conflict.yml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-multi.yml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-single.yml
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml

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


Compare: https://github.com/Evolveum/midpoint/compare/ce202a611db9...27487ef0893f