[midPoint-git] [Evolveum/midpoint] 536648: fix for TestSecurity.test260AutzJackObjectFilterLo...

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 536648567264bd730b8d68d28467c8f1b39446ca
      https://github.com/Evolveum/midpoint/commit/536648567264bd730b8d68d28467c8f1b39446ca
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/CollectionRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java

  Log Message:
  -----------
  fix for TestSecurity.test260AutzJackObjectFilterLocationShadowRole MID-1873


  Commit: 1861bf3135586ecd5aca95e405dea599943fc2ca
      https://github.com/Evolveum/midpoint/commit/1861bf3135586ecd5aca95e405dea599943fc2ca
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    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/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.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/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/resources/common/user-barbossa.xml
    A model/model-intest/src/test/resources/orgstruct/role-organized.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/023d5d29233a...1861bf313558