[midPoint-git] midPoint branch v2.2-support updated. v2.2-71-gcfbaaeb

[Radovan Semancik]

Project "midPoint" branch v2.2-support has been updated
       via  cfbaaeb34a9c7250edabdfd2bf8586c390d83ceb (commit) v2.2-71-gcfbaaeb
       via  93a843c42405397796ca0f62d4f7a3c1752dd2bd (commit) v2.2-70-g93a843c
      from  92632bd1a087f3b1148769657ea6df25eedb0d01 (commit) v2.2-69-g92632bd

- Log -----------------------------------------------------------------
commit cfbaaeb34a9c7250edabdfd2bf8586c390d83ceb
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Oct 9 17:24:13 2013 +0200

    Fixing handling of ProtectedStringType in mappings. Basic function for encryption/decryption. MID-1625

commit 93a843c42405397796ca0f62d4f7a3c1752dd2bd
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Oct 9 14:25:51 2013 +0200

    Opimizations: reducing the number of provisioning fetch operations.
    Also extending the tests to check for number of operations.
    Fixing few bugs in provisioning related to fetching attributes not retrned by default (+test)
    Fixing handling of java.lang.Error in UCF.
    A handful of minor fixes.

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

(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/common/expression/ExpressionUtil.java |   69 ++++-
 .../evaluator/AsIsExpressionEvaluator.java         |    9 +-
 .../evaluator/AsIsExpressionEvaluatorFactory.java  |    8 +-
 .../evaluator/PathExpressionEvaluator.java         |    8 +-
 .../evaluator/PathExpressionEvaluatorFactory.java  |    8 +-
 .../functions/BasicExpressionFunctions.java        |   24 +-
 .../expression/script/ScriptExpressionFactory.java |   10 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |   12 +-
 .../midpoint/common/monitor/InternalMonitor.java   |   93 +++++++
 .../common/expression/ExpressionTestUtil.java      |   10 +-
 .../expression/script/AbstractScriptTest.java      |   11 +-
 .../expression/script/TestExpressionFunctions.java |    5 +-
 .../expression/script/TestGroovyExpressions.java   |    5 +-
 .../script/TestJavaScriptExpressions.java          |    5 +-
 .../expression/script/TestXPathExpressions.java    |    3 +-
 .../common/mapping/MappingTestEvaluator.java       |   94 ++++++-
 .../common/mapping/TestMappingDynamicSimple.java   |   67 ++++-
 .../common/mapping/TestMappingDynamicSysVar.java   |   84 ++++++
 ...{mapping-asis.xml => mapping-asis-password.xml} |    2 +-
 ...g-script-system-variables-password-decrypt.xml} |    5 +-
 ...> mapping-script-system-variables-password.xml} |    5 +-
 .../src/test/resources/mapping/user-jack.xml       |   10 +-
 .../midpoint/prism/delta/DeltaSetTriple.java       |    4 +
 .../prism/delta/PrismValueDeltaSetTriple.java      |    4 +-
 .../evolveum/midpoint/model/lens/Clockwork.java    |   42 ++-
 .../lens/projector/ConsolidationProcessor.java     |   86 ++++--
 .../midpoint/model/sync/action/BaseAction.java     |    7 +-
 model/model-impl/src/main/resources/ctx-model.xml  |    6 +
 .../midpoint/model/lens/TestClockwork.java         |   14 +
 .../midpoint/model/lens/TestProjector.java         |   15 +
 .../model-impl/src/test/resources/logback-test.xml |    1 +
 .../midpoint/model/intest/TestMapping.java         |   10 +-
 .../model/intest/TestModelServiceContract.java     |  292 ++++++++++----------
 .../midpoint/model/intest/TestStrangeCases.java    |    2 +-
 .../model/intest/sync/AbstractInboundSyncTest.java |    8 +-
 .../model/intest/sync/TestImportRecon.java         |   70 +++++
 .../src/test/resources/logback-test.xml            |   12 +-
 .../provisioning/impl/EntitlementConverter.java    |   11 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |   21 +-
 .../provisioning/impl/ResourceObjectConverter.java |   74 ++---
 .../midpoint/provisioning/impl/ShadowCache.java    |   26 +-
 .../provisioning/ucf/api/ConnectorInstance.java    |    5 +-
 .../ucf/impl/ConnectorFactoryIcfImpl.java          |    6 +-
 .../ucf/impl/ConnectorInstanceIcfImpl.java         |  100 +++++--
 .../midpoint/provisioning/ucf/impl/IcfUtil.java    |    2 +-
 .../provisioning/util/ProvisioningUtil.java        |   56 ++++
 .../provisioning/test/impl/AbstractDummyTest.java  |   78 +-----
 .../midpoint/provisioning/test/impl/TestDummy.java |   51 +++-
 .../provisioning/test/ucf/TestUcfDummy.java        |    6 +-
 .../provisioning/test/ucf/TestUcfOpenDj.java       |    4 +-
 .../midpoint/test/AbstractIntegrationTest.java     |   95 ++++++-
 51 files changed, 1191 insertions(+), 464 deletions(-)
 copy infra/common/src/test/resources/mapping/{mapping-asis.xml => mapping-asis-password.xml} (95%)
 copy infra/common/src/test/resources/mapping/{mapping-script-system-variables-employee-type.xml => mapping-script-system-variables-password-decrypt.xml} (90%)
 copy infra/common/src/test/resources/mapping/{mapping-script-system-variables-employee-type.xml => mapping-script-system-variables-password.xml} (92%)


hooks/post-receive
-- 
midPoint