[midPoint-git] midPoint branch master updated. v2.2-100-gbed928a

[Radovan Semancik]

Project "midPoint" branch master has been updated
       via  bed928a2da1c9438d3d68d44476734fc74b67868 (commit) v2.2-100-gbed928a
      from  b78e39fa7971d350f6e5c842f7c46041ab4155c1 (commit) v2.2-99-gb78e39f

- Log -----------------------------------------------------------------
commit bed928a2da1c9438d3d68d44476734fc74b67868
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

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

(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 +--
 .../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 +--
 model/model-impl/src/main/resources/ctx-model.xml  |    6 ++
 22 files changed, 385 insertions(+), 75 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