[midPoint-svn] midPoint branch master updated. midpoint-2.2-10-g54befa3

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  54befa3dc2b6dba25858b0006fe20d763ea0e22f (commit) midpoint-2.2-10-g54befa3
       via  de265e58afe0bbeac41e2adc9ca2caa9033549e2 (commit) midpoint-2.2-2-gde265e5
      from  94b438995d8a10ce28b9a6645416f90bc851384b (commit) midpoint-2.2-8-g94b4389

- Log -----------------------------------------------------------------
commit 54befa3dc2b6dba25858b0006fe20d763ea0e22f
Merge: de265e5 94b4389
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Sep 10 14:33:36 2013 +0200

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

commit de265e58afe0bbeac41e2adc9ca2caa9033549e2
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Sep 10 14:33:06 2013 +0200

    added test to test scripts executed by reconciliation..

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

(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:
 .../midpoint/model/lens/ChangeExecutor.java        |    7 +-
 .../midpoint/model/lens/TestReconScript.java       |  116 ++++++++++++++++++++
 .../src/test/resources/common/resource-dummy.xml   |   32 +++++-
 .../test/resources/common/task-reconcile-dummy.xml |    0
 model/model-impl/testng.xml                        |    1 +
 5 files changed, 152 insertions(+), 4 deletions(-)
 create mode 100644 model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestReconScript.java
 copy model/{model-intest => model-impl}/src/test/resources/common/task-reconcile-dummy.xml (100%)


hooks/post-receive
-- 
midPoint