[midPoint-svn] midPoint branch master updated. midpoint-2.2rc2-16-g46c0caf

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  46c0cafc9c11e16c5acf0f0f9506374ce11cadb6 (commit) midpoint-2.2rc2-16-g46c0caf
       via  f0b1ae7366306bef6432b7c83005ef937b29f94f (commit) midpoint-2.2rc2-15-gf0b1ae7
      from  7bd34e1b2c7f5af45af6321ae81758ba9ec7ae90 (commit) midpoint-2.2rc2-14-g7bd34e1

- Log -----------------------------------------------------------------
commit 46c0cafc9c11e16c5acf0f0f9506374ce11cadb6
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Aug 16 10:13:11 2013 +0200

    added test for correlation confirmation evaluator (testing more than one correlations MID-MID-1278)

commit f0b1ae7366306bef6432b7c83005ef937b29f94f
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Aug 16 01:12:35 2013 +0200

    Allowing multiple correlation expressions to be specified with conditions (MID-1278)

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

(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:
 .../resources/xml/ns/public/common/common-2a.xsd   |    2 +-
 .../sync/CorrelationConfirmationEvaluator.java     |  260 ++++++++++++--------
 .../model/expr/ExpressionHandlerImplTest.java      |    6 +-
 .../sync/TestCorrelationConfiramtionEvaluator.java |   43 +++-
 ...-or-filter.xml => correlation-first-filter.xml} |   83 +++----
 ...or-filter.xml => correlation-second-filter.xml} |   83 +++----
 6 files changed, 272 insertions(+), 205 deletions(-)
 copy model/model-impl/src/test/resources/sync/{correlation-or-filter.xml => correlation-first-filter.xml} (66%)
 copy model/model-impl/src/test/resources/sync/{correlation-or-filter.xml => correlation-second-filter.xml} (72%)


hooks/post-receive
-- 
midPoint