[midPoint-git] [Evolveum/midpoint] e1dc11: Fixing entitlement identifier type conversion

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: e1dc11b27d7f8debd91f5123beb367ad517f97f4
      https://github.com/Evolveum/midpoint/commit/e1dc11b27d7f8debd91f5123beb367ad517f97f4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M samples/demo-rs/resource-ldap-openldap.xml
    M samples/resources/openldap/openldap-localhost-medium.xml

  Log Message:
  -----------
  Fixing entitlement identifier type conversion


  Commit: 75cc0187fc299cb5de16057b20b481912b981d96
      https://github.com/Evolveum/midpoint/commit/75cc0187fc299cb5de16057b20b481912b981d96
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd
    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
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy/privilege-bargain.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/6685fa2ad498...75cc0187fc29