[midPoint-git] midPoint branch bootstrap updated. v2.2-165-gf3fcd93

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  f3fcd933893017d862e561beae9804ae7a1bad93 (commit) v2.2-165-gf3fcd93
       via  690dfb0954d1f37039b64b90622c99c40283c161 (commit) v2.2-102-g690dfb0
       via  2d68ff276fad35aac1102d6f09816494f419beb1 (commit) v2.2-101-g2d68ff2
       via  bed928a2da1c9438d3d68d44476734fc74b67868 (commit) v2.2-100-gbed928a
      from  93fb3f89e2cff7c23128609abede0414bf16cea4 (commit) v2.2-161-g93fb3f8

- Log -----------------------------------------------------------------
commit f3fcd933893017d862e561beae9804ae7a1bad93
Merge: 93fb3f8 690dfb0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Oct 10 09:48:41 2013 +0200

    Merge branch 'master' into bootstrap

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

(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:
 .../web/page/admin/configuration/PageAccounts.java |   59 ++---
 .../icf/dummy/connector/DummyConfiguration.java    |   29 ++-
 .../icf/dummy/connector/DummyConnector.java        |  155 +++++++++++--
 .../evolveum/icf/dummy/resource/DummyDelta.java    |   14 +-
 .../evolveum/icf/dummy/resource/DummyObject.java   |    9 +
 .../evolveum/icf/dummy/resource/DummyResource.java |  228 ++++++++++++++++----
 .../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 +
 .../midpoint/model/lens/TestReconScript.java       |    2 +-
 .../model/intest/sync/AbstractInboundSyncTest.java |    2 +-
 .../sync/AbstractSynchronizationStoryTest.java     |    4 +-
 .../midpoint/provisioning/test/impl/TestDummy.java |    2 +-
 32 files changed, 789 insertions(+), 175 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