[midPoint-svn] midPoint branch master updated. v2.2-38-gdd8622e

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  dd8622e184cd4af56cd0292556bd557e27b5571f (commit) v2.2-38-gdd8622e
       via  c09b19b9a42fbd1ba3faffe16f299ce521547e57 (commit) v2.2-27-gc09b19b
       via  18d28437c6731d8f62db0a93feeb6b46c4b45847 (commit) v2.2-26-g18d2843
      from  40f05f6e8ef626a05315b68075a3bdd6fe90e4af (commit) v2.2-35-g40f05f6

- Log -----------------------------------------------------------------
commit dd8622e184cd4af56cd0292556bd557e27b5571f
Merge: c09b19b 40f05f6
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 23 10:46:16 2013 +0200

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

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

    clean up (removed unused imports)

commit 18d28437c6731d8f62db0a93feeb6b46c4b45847
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:
 .../midpoint/prism/query/PropertyValueFilter.java  |    7 +-
 .../lens/projector/AccountValuesProcessor.java     |   69 ++--
 .../midpoint/model/lens/projector/Projector.java   |   25 +-
 .../sync/CorrelationConfirmationEvaluator.java     |    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 +++--
 12 files changed, 527 insertions(+), 420 deletions(-)
 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