[midPoint-svn] midPoint branch master updated. midpoint-2.2rc2-65-g245269b

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  245269b20758d4b50bf42f799d68348c0dffa314 (commit) midpoint-2.2rc2-65-g245269b
       via  5c6ad85820b13eb5917a12d50dd9a2958322b788 (commit) midpoint-2.2rc2-64-g5c6ad85
      from  22015ba65c5157ecfdbc5ba35d38234965277f81 (commit) midpoint-2.2rc2-63-g22015ba

- Log -----------------------------------------------------------------
commit 245269b20758d4b50bf42f799d68348c0dffa314
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Aug 27 19:06:46 2013 +0200

    testing correlation expression with condition..

commit 5c6ad85820b13eb5917a12d50dd9a2958322b788
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Aug 27 08:04:27 2013 +0200

    adding condition to query api..

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

(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/ObjectQuery.java |   27 +++++
 .../src/main/resources/xml/ns/public/query-2.xsd   |    3 +-
 .../evolveum/midpoint/schema/PagingConvertor.java  |   37 +++++++
 .../evolveum/midpoint/schema/QueryConvertor.java   |   11 ++
 .../sync/CorrelationConfirmationEvaluator.java     |  115 ++++++++++++++------
 .../sync/TestCorrelationConfiramtionEvaluator.java |   36 ++++++
 ...l => correlation-with-condition-emplNumber.xml} |   33 +++---
 ...t-filter.xml => correlation-with-condition.xml} |   13 ++-
 .../model/intest/TestModelServiceContract.java     |    2 +-
 9 files changed, 226 insertions(+), 51 deletions(-)
 copy model/model-impl/src/test/resources/sync/{correlation-first-filter.xml => correlation-with-condition-emplNumber.xml} (69%)
 copy model/model-impl/src/test/resources/sync/{correlation-first-filter.xml => correlation-with-condition.xml} (79%)


hooks/post-receive
-- 
midPoint