[midPoint-git] midPoint branch v2.2-support updated. v2.2support-128-gd959393

[Radovan Semancik]

Project "midPoint" branch v2.2-support has been updated
       via  d959393583454af9e121f6fd25efa54c7289c844 (commit) v2.2support-128-gd959393
       via  892d24f8c2eaaa47f6bb4b56c511721dae778e98 (commit) v2.2support-127-g892d24f
       via  7f7b95d019cb86c4950a5d84943788d6636295f0 (commit) v2.2support-126-g7f7b95d
      from  d8ba146b351873e1b135440d9773efec2acabe9d (commit) v2.2support-125-gd8ba146

- Log -----------------------------------------------------------------
commit d959393583454af9e121f6fd25efa54c7289c844
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Oct 29 22:11:33 2013 +0100

    Time-based mappings in object template (MID-1623). Also some more fixes after PrismPropertyValue checks.

commit 892d24f8c2eaaa47f6bb4b56c511721dae778e98
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Oct 29 17:34:07 2013 +0100

    Fix after PrismPropertyValue checks

commit 7f7b95d019cb86c4950a5d84943788d6636295f0
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Oct 29 16:00:37 2013 +0100

    Fixing after PrismPropertyValue value check.

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

(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/prism/xml/XmlTypeConverter.java       |   10 ++
 .../midpoint/model/lens/AccountConstruction.java   |    5 +-
 .../model/lens/projector/UserPolicyProcessor.java  |  136 ++++++++++++++------
 .../AbstractConfiguredModelIntegrationTest.java    |    2 +-
 .../AbstractInitializedModelIntegrationTest.java   |    2 +-
 .../midpoint/model/intest/TestActivation.java      |    6 +-
 .../midpoint/model/intest/TestIteration.java       |    2 +-
 .../model/intest/TestLoggingConfiguration.java     |    2 +-
 .../midpoint/model/intest/TestUserTemplate.java    |   44 +++++++
 .../model/intest/negative/TestBrokenCSV.java       |    2 +-
 .../resources/common/user-template-complex.xml     |   16 +++
 .../model/test/AbstractModelIntegrationTest.java   |   16 +++
 .../midpoint/repo/sql/ConcurrencyTest.java         |    3 +-
 .../midpoint/test/AbstractIntegrationTest.java     |   15 +++
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |    2 +-
 15 files changed, 215 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
midPoint