[midPoint-svn] midPoint branch master updated. midpoint-2.2rc2-39-gc2ce7a7

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  c2ce7a71bc1620a06c4c589faab0ccfa459c40af (commit) midpoint-2.2rc2-39-gc2ce7a7
       via  1c47aac68a4919b530176f9516d2a548e1caeafb (commit) midpoint-2.2rc2-28-g1c47aac
       via  952990a5b00a63376e0994d35fb7bb13a4fba212 (commit) midpoint-2.2rc2-27-g952990a
      from  dec142631a7572f2bee2fd00013abcfe1445d1c1 (commit) midpoint-2.2rc2-36-gdec1426

- Log -----------------------------------------------------------------
commit c2ce7a71bc1620a06c4c589faab0ccfa459c40af
Merge: 1c47aac dec1426
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Aug 20 17:35:39 2013 +0200

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

commit 1c47aac68a4919b530176f9516d2a548e1caeafb
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Aug 20 17:34:52 2013 +0200

    implementing tolerant and intolerant value patterns..(MID-1495)

commit 952990a5b00a63376e0994d35fb7bb13a4fba212
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Aug 19 15:02:50 2013 +0200

    implementing patterns for tolerant attributes (MID-1495)

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

(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:
 .../refinery/RefinedAttributeDefinition.java       |   15 ++++++
 .../com/evolveum/midpoint/prism/Matchable.java     |    2 +
 .../midpoint/prism/match/DefaultMatchingRule.java  |   18 +++++++
 .../midpoint/prism/match/MatchingRule.java         |    7 +++
 .../prism/match/PolyStringNormMatchingRule.java    |   11 ++++
 .../prism/match/PolyStringOrigMatchingRule.java    |   11 ++++
 .../prism/match/PolyStringStrictMatchingRule.java  |   11 ++++
 .../prism/match/StringIgnoreCaseMatchingRule.java  |   11 ++++
 .../midpoint/prism/polystring/PolyString.java      |    6 +++
 .../lens/projector/ReconciliationProcessor.java    |   56 ++++++++++++++++++--
 .../model/lens/projector/ValueMatcher.java         |    5 ++
 ...st-resource-sync-no-extension-advanced-test.xml |    1 +
 12 files changed, 151 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
midPoint