[midPoint-svn] midPoint branch master updated. midpoint-2.2rc2-106-g601eb42

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  601eb421e4f640775a09fd4ac1805f8cbd6f247e (commit) midpoint-2.2rc2-106-g601eb42
       via  3b428163015c70e263dd51dfd3269849eb520ba4 (commit) midpoint-2.2rc2-104-g3b42816
      from  3385a450802f09e6cfc141b853d78f511c3c6c4b (commit) midpoint-2.2rc2-104-g3385a45

- Log -----------------------------------------------------------------
commit 601eb421e4f640775a09fd4ac1805f8cbd6f247e
Merge: 3b42816 3385a45
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 2 11:26:43 2013 +0200

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

commit 3b428163015c70e263dd51dfd3269849eb520ba4
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Sep 2 11:26:13 2013 +0200

    improving consistency mechanism
    (discovery for get operation -> extending getObject method with task)

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

(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/schema/util/ResourceTypeUtil.java     |    5 ++
 .../evolveum/midpoint/schema/util/ShadowUtil.java  |    4 ++
 .../midpoint/model/ModelObjectResolver.java        |   19 +++----
 .../midpoint/model/controller/ModelController.java |    6 +--
 .../midpoint/model/expr/ExpressionHandler.java     |    2 +-
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    4 +-
 .../midpoint/model/lens/ChangeExecutor.java        |    6 +--
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    4 +-
 .../lens/projector/AccountValuesProcessor.java     |    4 +-
 .../model/lens/projector/ContextLoader.java        |   16 +++---
 .../lens/projector/ReconciliationProcessor.java    |    2 +-
 .../midpoint/model/sync/LiveSyncTaskHandler.java   |    2 +-
 .../model/sync/ReconciliationTaskHandler.java      |    4 +-
 .../midpoint/model/sync/action/AddUserAction.java  |    2 +-
 .../midpoint/model/sync/action/BaseAction.java     |    2 +-
 .../util/AbstractSearchIterativeTaskHandler.java   |    2 +-
 .../com/evolveum/midpoint/model/util/Utils.java    |    2 +-
 .../model/test/AbstractModelIntegrationTest.java   |    2 +-
 .../provisioning/api/ProvisioningService.java      |    2 +-
 .../consistency/impl/GenericErrorHandler.java      |   13 +++--
 .../impl/ObjectAlreadyExistHandler.java            |    5 +-
 .../consistency/impl/ObjectNotFoundHandler.java    |    2 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |   13 +++--
 .../midpoint/provisioning/impl/ShadowCache.java    |    4 +-
 .../testing/consistency/ConsistencyTest.java       |   53 ++++++++++++++++++--
 25 files changed, 123 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
midPoint