[midPoint-git] [Evolveum/midpoint] 83a167: fixing failing test..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 83a1675a74eac1b4d36e5abb3cd5954c8adf67f0
      https://github.com/Evolveum/midpoint/commit/83a1675a74eac1b4d36e5abb3cd5954c8adf67f0
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java

  Log Message:
  -----------
  fixing failing test..


  Commit: 54f65fd1cfc60fac4310e67a09aa087b497cef65
      https://github.com/Evolveum/midpoint/commit/54f65fd1cfc60fac4310e67a09aa087b497cef65
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    A model/model-impl/src/test/resources/lens/org-brethren.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/logback-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/9da6902f782f...54f65fd1cfc6