[midPoint-git] [Evolveum/midpoint] eed1b4: fixing story tests..

[katkav]

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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Construction.java
    M testing/story/src/test/resources/common/system-configuration.xml
    M testing/story/src/test/resources/trafo/resource-dummy-ad.xml

  Log Message:
  -----------
  fixing story tests..


  Commit: 21d5277f64bd41f9696a2f42e150a212d3c95574
      https://github.com/Evolveum/midpoint/commit/21d5277f64bd41f9696a2f42e150a212d3c95574
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
    M testing/longtest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  fixing long test..


  Commit: aac30174e5ba1202d0fe5df7464efdf836879434
      https://github.com/Evolveum/midpoint/commit/aac30174e5ba1202d0fe5df7464efdf836879434
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  fixing long tests..


  Commit: 0d867a53208eb4a40a9dd3902038107e5f7020c7
      https://github.com/Evolveum/midpoint/commit/0d867a53208eb4a40a9dd3902038107e5f7020c7
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskDeprecated.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTaskDeprecated.java
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/221b5e4c78ae...0d867a53208e