[midPoint-git] midPoint branch master updated. v2.2-76-g95f1994

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  95f1994354f0541655aca247a9b9ad24a83cb32d (commit) v2.2-76-g95f1994
       via  341ccd9a91ad12ea14c5568ad500f20cc062b1d8 (commit) v2.2-74-g341ccd9
       via  777652b1e5f0cd4ea90160212c18fe5a679ebbc9 (commit) v2.2-73-g777652b
      from  cd586fa3cb5603155297b0fda38c4d7289f5a932 (commit) v2.2-73-gcd586fa

- Log -----------------------------------------------------------------
commit 95f1994354f0541655aca247a9b9ad24a83cb32d
Merge: 341ccd9 cd586fa
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 30 15:22:47 2013 +0200

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

commit 341ccd9a91ad12ea14c5568ad500f20cc062b1d8
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 30 15:22:15 2013 +0200

    fixing MID-1591 (correlation and matching rule), added new test..

commit 777652b1e5f0cd4ea90160212c18fe5a679ebbc9
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 30 14:53:49 2013 +0200

    fixing MID-1591 (correlation and matching rule)

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

(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:
 .../evolveum/midpoint/prism/query/AndFilter.java   |    5 +-
 .../midpoint/prism/query/EqualsFilter.java         |   70 +++++++++++++++++++-
 .../midpoint/prism/query/GreaterFilter.java        |    3 +-
 .../evolveum/midpoint/prism/query/LessFilter.java  |    3 +-
 .../evolveum/midpoint/prism/query/NotFilter.java   |    5 +-
 .../midpoint/prism/query/ObjectFilter.java         |    3 +-
 .../evolveum/midpoint/prism/query/ObjectQuery.java |    5 +-
 .../evolveum/midpoint/prism/query/OrFilter.java    |    5 +-
 .../evolveum/midpoint/prism/query/OrgFilter.java   |    3 +-
 .../midpoint/prism/query/PropertyValueFilter.java  |   37 ++++++++---
 .../evolveum/midpoint/prism/query/RefFilter.java   |   12 +++-
 .../midpoint/prism/query/SubstringFilter.java      |   33 +++++----
 .../evolveum/midpoint/prism/query/ValueFilter.java |   26 ++++++++
 .../evolveum/midpoint/prism/TestObjectQuery.java   |   21 ++++--
 .../sync/CorrelationConfirmationEvaluator.java     |    6 +-
 .../sync/TestCorrelationConfiramtionEvaluator.java |   57 +++++++++++++++-
 ...> correlation-case-insensitive_empl_number.xml} |    4 +-
 17 files changed, 247 insertions(+), 51 deletions(-)
 copy model/model-impl/src/test/resources/sync/{correlation-case-insensitive.xml => correlation-case-insensitive_empl_number.xml} (92%)


hooks/post-receive
-- 
midPoint