[midPoint-git] [Evolveum/midpoint] c853bb: Yet another attempt at fixing MID-2102 (iterator f...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c853bbb0a45978716808d6c13866d80d5cc9d3e3
      https://github.com/Evolveum/midpoint/commit/c853bbb0a45978716808d6c13866d80d5cc9d3e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectPaging.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/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    A model/model-intest/src/test/resources/iteration/user-alfred.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/resources/common/resource-opendj-complex.xml
    M testing/longtest/src/test/resources/common/resource-opendj-university.xml

  Log Message:
  -----------
  Yet another attempt at fixing MID-2102 (iterator fails if no shadow exists).
This time we kill primary delta if it's ADD one and the object already exists.
Also: Accepting null from countObjects in AbstractSearchIterativeTaskHandler.


  Commit: a0576c7b86d9adfad18b890c2db12b806cb2986b
      https://github.com/Evolveum/midpoint/commit/a0576c7b86d9adfad18b890c2db12b806cb2986b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    A samples/resources/389ds/389ds-localhost-medium.xml
    M samples/resources/openldap/openldap-localhost-medium.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/73b668591bc3...a0576c7b86d9