[midPoint-git] midPoint branch master updated. v2.3devel-212-g15be794

[Radovan Semancik]

Project "midPoint" branch master has been updated
       via  15be7945994b1141f6482dddde9963a3f8456f5b (commit) v2.3devel-212-g15be794
       via  43888d4cb2e3e342999f54f4b3150e24448552cb (commit) v2.3devel-211-g43888d4
       via  774991eb51d05f5fa4a466e2a2a11686c63a7e27 (commit) v2.3devel-208-g774991e
      from  d79b7a84bb38e91923952db75a38a29522c6c748 (commit) v2.3devel-209-gd79b7a8

- Log -----------------------------------------------------------------
commit 15be7945994b1141f6482dddde9963a3f8456f5b
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Nov 20 18:45:38 2013 +0100

    Extending the recon tests even more.

commit 43888d4cb2e3e342999f54f4b3150e24448552cb
Merge: 774991e d79b7a8
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Nov 20 18:33:35 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
    
    Conflicts:
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java

commit 774991eb51d05f5fa4a466e2a2a11686c63a7e27
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Nov 20 18:30:08 2013 +0100

    Extending the recon tests

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

(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:
 .../model/sync/ReconciliationTaskHandler.java      |  176 +++++---------------
 .../model/sync/ReconciliationTaskResult.java       |  172 +++++++++++++++++++
 .../ReconciliationTaskResultListener.java}         |   17 +-
 .../DebugReconciliationTaskResultListener.java     |   68 ++++++++
 .../model/intest/sync/TestImportRecon.java         |   32 ++++
 5 files changed, 326 insertions(+), 139 deletions(-)
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskResult.java
 copy model/model-impl/src/main/java/com/evolveum/midpoint/model/{PolicyDecision.java => sync/ReconciliationTaskResultListener.java} (69%)
 create mode 100644 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/DebugReconciliationTaskResultListener.java


hooks/post-receive
-- 
midPoint