[midPoint-git] midPoint branch master updated. v2.3devel-326-g86d5e7d

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  86d5e7dca6f783eea636e4d14fe9ab30ee639bc1 (commit) v2.3devel-326-g86d5e7d
       via  0dc468ef055bb610bd41c91bfa8f5536a276a0d5 (commit) v2.3devel-308-g0dc468e
       via  aa5c26f25c3dbc0265be12bebe3b23e3d7d816bf (commit) v2.3devel-307-gaa5c26f
       via  52618109b616db72a49bc584e0d3ee80a1c7f779 (commit) v2.3devel-306-g5261810
       via  5f5cd39ca9ed81b4f4493c5ce153b51b541ab668 (commit) v2.3devel-287-g5f5cd39
      from  a38efa4b0e7a8e0230d49c6388979cf6e2e639c6 (commit) v2.3devel-321-ga38efa4

- Log -----------------------------------------------------------------
commit 86d5e7dca6f783eea636e4d14fe9ab30ee639bc1
Merge: 0dc468e a38efa4
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Dec 6 09:38:12 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
    
    Conflicts:
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/InboundProcessor.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java

commit 0dc468ef055bb610bd41c91bfa8f5536a276a0d5
Author: katkav <k.valalikova at evolveum.com>
Date:   Fri Dec 6 07:37:25 2013 +0100

    improvement of inboud mapping evaluation -> support for multiple mappings

commit aa5c26f25c3dbc0265be12bebe3b23e3d7d816bf
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Dec 3 18:44:07 2013 +0100

    using exceptChannel for mapping evaluation..

commit 52618109b616db72a49bc584e0d3ee80a1c7f779
Merge: 5f5cd39 2e979ef
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Dec 3 16:02:39 2013 +0100

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

commit 5f5cd39ca9ed81b4f4493c5ce153b51b541ab668
Author: katkav <k.valalikova at evolveum.com>
Date:   Tue Dec 3 15:54:05 2013 +0100

    expanding schema for mapping with exceptChannel value..

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

(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/common/mapping/Mapping.java  |    4 +
 .../LayerRefinedObjectClassDefinition.java         |    2 +-
 .../refinery/RefinedObjectClassDefinition.java     |    2 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |   11 +-
 .../model/lens/projector/InboundProcessor.java     |  305 ++++++++++++++------
 .../lens/projector/MappingEvaluationHelper.java    |    2 +-
 .../midpoint/model/lens/projector/Projector.java   |    2 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |    2 +-
 .../impl/ResourceEventListenerImpl.java            |    2 +-
 .../midpoint/provisioning/impl/ShadowCache.java    |   10 +-
 .../midpoint/testing/sanity/TestSanity.java        |   43 ++-
 .../src/test/resources/repo/resource-opendj.xml    |   13 +-
 12 files changed, 274 insertions(+), 124 deletions(-)


hooks/post-receive
-- 
midPoint