[midPoint-git] [Evolveum/midpoint] abf73b: fixing conflict after cherry pick

[Katarina Valalikova]

  Branch: refs/heads/support-3.3
  Home:   https://github.com/Evolveum/midpoint
  Commit: abf73b4d02b4a4d4fc5f3fb8cf94c5fd7bfe413b
      https://github.com/Evolveum/midpoint/commit/abf73b4d02b4a4d4fc5f3fb8cf94c5fd7bfe413b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
    M model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    M model/model-impl/src/test/resources/lens/role-corp-customer.xml
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    A model/model-impl/src/test/resources/lens/role-corp-generic-metarole-dynamic.xml
    A model/model-impl/src/test/resources/lens/role-corp-job-metarole-dynamic.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    M model/model-impl/src/test/resources/schema/piracy.xsd
    M model/model-impl/testng-unit.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    A samples/rest/modify-user-assign-role.xml

  Log Message:
  -----------
  fixing conflict after cherry pick


  Commit: bd8e0444d15bcdf51fe472ad48c952184a2cd277
      https://github.com/Evolveum/midpoint/commit/bd8e0444d15bcdf51fe472ad48c952184a2cd277
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    A repo/repo-sql-impl-test/src/test/resources/basic/role-resource-filter.xml

  Log Message:
  -----------
  small improvement for "dynamic" assignments


  Commit: 1bf1c4b9bae492c323b762ad2ba974833ad4e1b4
      https://github.com/Evolveum/midpoint/commit/1bf1c4b9bae492c323b762ad2ba974833ad4e1b4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java

  Log Message:
  -----------
  fixing compilation errors


Compare: https://github.com/Evolveum/midpoint/compare/993af783d48f...1bf1c4b9bae4