[midPoint-svn] midPoint branch v2.2-support updated. v2.2-21-gd4bb1ea

[Katka Valalikova]

Project "midPoint" branch v2.2-support has been updated
       via  d4bb1ea0e90a41a9a873d1c3f51e71ad182dab56 (commit) v2.2-21-gd4bb1ea
       via  c40b5fb49bc6a90f4071db789bb1352754a0eba0 (commit) v2.2-19-gc40b5fb
       via  c38482e9d30ac4d6675421a072fe3831b62445cd (commit) v2.2-18-gc38482e
       via  ce1ba787948493e6f96df39b5be32bd88f364958 (commit) v2.2-17-gce1ba78
       via  497dc8f7e1faae033da67a504570c72453834db2 (commit) v2.2-16-g497dc8f
       via  030f799ef57dc4bc460a3d07fa96d87c92f926af (commit) v2.2-15-g030f799
      from  034839d1b14f0d9873ac0c1702b244470c38e1f1 (commit) v2.2-15-g034839d

- Log -----------------------------------------------------------------
commit d4bb1ea0e90a41a9a873d1c3f51e71ad182dab56
Merge: c40b5fb 034839d
Author: katkav <k.valalikova at evolveum.com>
Date:   Thu Sep 26 11:59:00 2013 +0200

    Merge branch 'v2.2-support' of git.evolveum.com:/srv/git/projects/midpoint into v2.2-support

commit c40b5fb49bc6a90f4071db789bb1352754a0eba0
Author: katkav <k.valalikova at evolveum.com>
Date:   Wed Sep 25 14:09:40 2013 +0200

    fix for MID-1591
    
    improved matching object against query..

commit c38482e9d30ac4d6675421a072fe3831b62445cd
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Sep 24 11:13:34 2013 +0200

    fixing failing tests..

commit ce1ba787948493e6f96df39b5be32bd88f364958
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 23 13:01:10 2013 +0200

    fixing tests..

commit 497dc8f7e1faae033da67a504570c72453834db2
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 23 10:45:01 2013 +0200

    clean up (removed unused imports)

commit 030f799ef57dc4bc460a3d07fa96d87c92f926af
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 23 10:43:47 2013 +0200

    fix for MID-1577, MID-1595, MID-1599
    
    - fixed problem with matching user with correlation rules
    - fixed already exists problem for "add account" operation

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../java/com/evolveum/midpoint/prism/Item.java     |    2 +-
 .../midpoint/prism/PrismPropertyValue.java         |    3 +-
 .../midpoint/prism/query/PropertyValueFilter.java  |    9 +-
 .../evolveum/midpoint/model/lens/LensContext.java  |   10 +
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    4 +
 .../lens/projector/AccountValuesProcessor.java     |  128 ++++++--
 .../midpoint/model/lens/projector/Projector.java   |   28 +-
 .../sync/CorrelationConfirmationEvaluator.java     |    5 +-
 .../sync/TestCorrelationConfiramtionEvaluator.java |   86 ++++-
 ...filter.xml => correlation-case-insensitive.xml} |    5 +-
 .../testing/consistency/ConsistencyTest.java       |  208 ++++++++++--
 .../repo/{user-jack.xml => user-abom.xml}          |   17 +-
 .../repo/{user-jack.xml => user-abomba.xml}        |   17 +-
 .../repo/{user-herman.xml => user-discovery.xml}   |   72 ++---
 .../src/test/resources/request/discovery.ldif}     |   12 +-
 .../resource-modify-resource-schema.xml}           |  341 +++++---------------
 .../request/resource-modify-synchronization.xml    |   92 ++++++
 ...ls.xml => user-modify-add-account-directly.xml} |   82 +++--
 18 files changed, 688 insertions(+), 433 deletions(-)
 copy model/model-impl/src/test/resources/sync/{correlation-first-filter.xml => correlation-case-insensitive.xml} (85%)
 copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abom.xml} (78%)
 copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abomba.xml} (78%)
 copy testing/consistency-mechanism/src/test/resources/repo/{user-herman.xml => user-discovery.xml} (78%)
 copy testing/{sanity/src/test/resources/request/elaine.ldif => consistency-mechanism/src/test/resources/request/discovery.ldif} (56%)
 copy testing/consistency-mechanism/src/test/resources/{repo/resource-opendj.xml => request/resource-modify-resource-schema.xml} (56%)
 create mode 100644 testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
 copy testing/consistency-mechanism/src/test/resources/request/{user-modify-add-account-deniels.xml => user-modify-add-account-directly.xml} (85%)


hooks/post-receive
-- 
midPoint