[midPoint-git] [Evolveum/midpoint] 8307f0: Fixing resource definitions to support new connect...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8307f0df21047c0a0a0932296b53b5b97c2480f9
      https://github.com/Evolveum/midpoint/commit/8307f0df21047c0a0a0932296b53b5b97c2480f9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/longtest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing resource definitions to support new connector features.


  Commit: 6e1c1f4bebb839d693e0ad5a134847a398aa2d40
      https://github.com/Evolveum/midpoint/commit/6e1c1f4bebb839d693e0ad5a134847a398aa2d40
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    A model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/entitlements/role-wimp.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A samples/tasks/bulk-actions/recompute-users-with-a-role.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/e512aaefbf3d...6e1c1f4bebb8