[midPoint-git] midPoint branch master updated. v2.3devel-842-g5332d98

Radovan Semancik git at evolveum.com
Wed Jan 8 12:38:51 CET 2014


Project "midPoint" branch master has been updated
       via  5332d9859cdec5f36da521db6593572aee976fcf (commit) v2.3devel-842-g5332d98
       via  3f673024485901456596f424ca7c3b66c0f5f580 (commit) v2.3devel-835-g3f67302
      from  a888674683da5576f93d08ecf82852cc49a283fe (commit) v2.3devel-840-ga888674

- Log -----------------------------------------------------------------
commit 5332d9859cdec5f36da521db6593572aee976fcf
Merge: 3f67302 a888674
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Jan 8 12:36:33 2014 +0100

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

commit 3f673024485901456596f424ca7c3b66c0f5f580
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Jan 8 12:35:58 2014 +0100

    Refactoring: moving expression and mapping code to model-common component

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

(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/component/assignment/ACAttributeDto.java   |    7 +-
 ...uatorFactory.java => StaticExpressionUtil.java} |   83 ++++++++++++--------
 .../midpoint/common/CommonTestConstants.java       |    8 +-
 .../common/{expression => }/TestStaticValues.java  |    7 +-
 .../midpoint/common/crypto/TestProtector.java      |    6 +-
 .../{crypto/test-keystore.jceks => keystore.jceks} |  Bin 983 -> 983 bytes
 infra/common/testng.xml                            |   16 ----
 .../midpoint/test/util/MidPointTestConstants.java  |   13 +++
 {infra/common => model/model-common}/.gitignore    |    0
 model/{ => model-common}/pom.xml                   |   73 ++++++++++++-----
 .../model}/common/expression/Expression.java       |    4 +-
 .../expression/ExpressionEvaluationContext.java    |    2 +-
 .../common/expression/ExpressionEvaluator.java     |    2 +-
 .../expression/ExpressionEvaluatorFactory.java     |    2 +-
 .../common/expression/ExpressionFactory.java       |    2 +-
 .../expression/ExpressionSyntaxException.java      |    2 +-
 .../model}/common/expression/ExpressionUtil.java   |   10 +--
 .../common/expression/ExpressionVariables.java     |    2 +-
 .../model}/common/expression/ItemDeltaItem.java    |    2 +-
 .../common/expression/ObjectDeltaObject.java       |    2 +-
 .../midpoint/model}/common/expression/Source.java  |    2 +-
 .../model}/common/expression/SourceTriple.java     |    2 +-
 .../common/expression/StringPolicyResolver.java    |    2 +-
 ...ractValueTransformationExpressionEvaluator.java |   20 ++---
 .../evaluator/AsIsExpressionEvaluator.java         |   10 +--
 .../evaluator/AsIsExpressionEvaluatorFactory.java  |    4 +-
 .../evaluator/AssignmentExpressionEvaluator.java   |   14 ++--
 .../AssignmentExpressionEvaluatorFactory.java      |    6 +-
 .../evaluator/GenerateExpressionEvaluator.java     |   10 +--
 .../GenerateExpressionEvaluatorFactory.java        |    6 +-
 .../evaluator/LiteralExpressionEvaluator.java      |    8 +-
 .../LiteralExpressionEvaluatorFactory.java         |   53 ++-----------
 .../evaluator/PathExpressionEvaluator.java         |   14 ++--
 .../evaluator/PathExpressionEvaluatorFactory.java  |    6 +-
 .../functions/BasicExpressionFunctions.java        |    6 +-
 .../functions/BasicExpressionFunctionsXPath.java   |    2 +-
 .../expression/functions/FunctionLibrary.java      |    2 +-
 .../functions/LogExpressionFunctions.java          |    2 +-
 .../common/expression/script/ScriptEvaluator.java  |   10 +--
 .../common/expression/script/ScriptExpression.java |   10 +--
 .../script/ScriptExpressionEvaluationContext.java  |    6 +-
 .../script/ScriptExpressionEvaluator.java          |    8 +-
 .../script/ScriptExpressionEvaluatorFactory.java   |    6 +-
 .../expression/script/ScriptExpressionFactory.java |    8 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |   14 ++--
 .../script/xpath/LazyXPathVariableResolver.java    |    6 +-
 .../script/xpath/MidPointNamespaceContext.java     |    2 +-
 .../xpath/ReflectionXPathFunctionResolver.java     |    6 +-
 .../xpath/ReflectionXPathFunctionWrapper.java      |    8 +-
 .../script/xpath/XPathExpressionCodeHolder.java    |    2 +-
 .../script/xpath/XPathScriptEvaluator.java         |   12 +--
 .../midpoint/model}/common/mapping/Mapping.java    |   67 +++-------------
 .../model}/common/mapping/MappingFactory.java      |   16 ++--
 .../common/expression/ExpressionTestUtil.java      |   28 ++++---
 .../model}/common/expression/TestExpression.java   |   46 ++++-------
 .../common/expression/TestExpressionUtil.java      |   18 +++--
 .../expression/script/AbstractScriptTest.java      |   16 ++--
 .../expression/script/TestExpressionFunctions.java |    4 +-
 .../expression/script/TestGroovyExpressions.java   |    9 ++-
 .../script/TestJavaScriptExpressions.java          |    6 +-
 .../expression/script/TestScriptCaching.java       |   15 ++--
 .../expression/script/TestXPathExpressions.java    |    6 +-
 .../common/mapping/MappingTestEvaluator.java       |   18 ++---
 .../model}/common/mapping/TestMappingComplex.java  |   59 ++------------
 .../common/mapping/TestMappingDynamicSimple.java   |   68 ++++++----------
 .../common/mapping/TestMappingDynamicSysVar.java   |   60 +++-----------
 .../model}/common/mapping/TestMappingStatic.java   |    8 +-
 .../model}/common/mapping/TestMappingTime.java     |   59 +++-----------
 .../mapping/TestValueConstructionAbsolute.java     |    6 +-
 .../expression/expression/account-jack-dummy.xml   |    0
 .../expression/expression/iteration-condition.xml  |    0
 .../resources/expression/expression/user-jack.xml  |    0
 .../expression/functions/account-jack.xml          |    0
 .../expression/functions/resource-opendj.xml       |    0
 .../resources/expression/functions/user-jack.xml   |    0
 .../groovy/expression-func-concatname.xml          |    0
 .../expression/groovy/expression-func.xml          |    0
 .../expression/groovy/expression-list.xml          |    0
 .../expression-objectref-variables-polystring.xml  |    0
 .../groovy/expression-objectref-variables.xml      |    0
 .../expression/groovy/expression-simple.xml        |    0
 .../groovy/expression-string-variables.xml         |    0
 .../groovy/expression-user-extension-ship-path.xml |    0
 .../groovy/expression-user-extension-ship.xml      |    0
 .../groovy/expression-user-given-name.xml          |    0
 .../groovy/expression-user-stringify-full-name.xml |    0
 .../javascript/expression-func-concatname.xml      |    0
 .../expression/javascript/expression-func.xml      |    0
 .../expression/javascript/expression-list.xml      |    0
 .../expression-objectref-variables-polystring.xml  |    0
 .../javascript/expression-objectref-variables.xml  |    0
 .../expression/javascript/expression-simple.xml    |    0
 .../javascript/expression-string-variables.xml     |    0
 .../expression-user-extension-ship-path.xml        |    0
 .../javascript/expression-user-extension-ship.xml  |    0
 .../javascript/expression-user-given-name.xml      |    0
 .../expression-user-stringify-full-name.xml        |    0
 .../xpath/expression-func-concatname.xml           |    0
 .../resources/expression/xpath/expression-func.xml |    0
 .../resources/expression/xpath/expression-list.xml |    0
 .../expression-objectref-variables-polystring.xml  |    0
 .../xpath/expression-objectref-variables.xml       |    0
 .../expression/xpath/expression-root-node.xml      |    0
 .../expression/xpath/expression-simple.xml         |    0
 .../xpath/expression-string-variables.xml          |    0
 .../xpath/expression-user-extension-ship-path.xml  |    0
 .../xpath/expression-user-extension-ship.xml       |    0
 .../xpath/expression-user-given-name.xml           |    0
 .../xpath/expression-user-stringify-full-name.xml  |    0
 .../model-common/src/test/resources/keystore.jceks |  Bin 983 -> 983 bytes
 .../resources/mapping/account-inbound-mapping.xml  |    0
 .../src/test/resources/mapping/account-jack.xml    |    0
 .../resources/mapping/mapping-asis-password.xml    |    0
 ...pping-asis-system-variables-polystring-norm.xml |    0
 ...pping-asis-system-variables-polystring-orig.xml |    0
 .../src/test/resources/mapping/mapping-asis.xml    |    0
 .../resources/mapping/mapping-complex-captain.xml  |    0
 .../mapping/mapping-condition-nonempty.xml         |    0
 .../mapping/mapping-generate-policy-bad.xml        |    0
 .../mapping/mapping-generate-policy-numeric.xml    |    0
 .../resources/mapping/mapping-generate-policy.xml  |    0
 .../test/resources/mapping/mapping-generate.xml    |    0
 .../src/test/resources/mapping/mapping-inbound.xml |    0
 .../src/test/resources/mapping/mapping-npe.xml     |    0
 .../test/resources/mapping/mapping-path-enum.xml   |    0
 .../mapping/mapping-path-extension-variable.xml    |    0
 .../mapping-path-system-variables-namespace.xml    |    0
 .../mapping-path-system-variables-nosource.xml     |    0
 ...pping-path-system-variables-polystring-long.xml |    0
 ...ping-path-system-variables-polystring-short.xml |    0
 .../mapping/mapping-path-system-variables.xml      |    0
 .../mapping/mapping-script-date-groovy.xml         |    0
 .../mapping/mapping-script-extra-variables.xml     |    0
 .../resources/mapping/mapping-script-fullname.xml  |    0
 .../mapping-script-list-absolute-groovy.xml        |    0
 .../mapping/mapping-script-list-absolute-xpath.xml |    0
 .../mapping-script-list-relative-groovy.xml        |    0
 .../mapping/mapping-script-list-relative-xpath.xml |    0
 .../resources/mapping/mapping-script-root-node.xml |    0
 .../mapping/mapping-script-simple-groovy.xml       |    0
 .../mapping/mapping-script-simple-xpath.xml        |    0
 ...t-system-variables-condition-empty-function.xml |    0
 ...m-variables-condition-empty-single-function.xml |    0
 ...ipt-system-variables-condition-empty-single.xml |    0
 ...ing-script-system-variables-condition-empty.xml |    0
 ...ng-script-system-variables-condition-groovy.xml |    0
 ...em-variables-condition-sourcecontext-groovy.xml |    0
 ...ing-script-system-variables-condition-xpath.xml |    0
 ...ing-script-system-variables-employee-number.xml |    0
 ...pping-script-system-variables-employee-type.xml |    0
 ...ng-script-system-variables-password-decrypt.xml |    0
 .../mapping-script-system-variables-password.xml   |    0
 ...ipt-system-variables-polystring-groovy-norm.xml |    0
 ...cript-system-variables-polystring-groovy-op.xml |    0
 ...ipt-system-variables-polystring-groovy-orig.xml |    0
 ...g-script-system-variables-polystring-groovy.xml |    0
 ...ng-script-system-variables-polystring-xpath.xml |    0
 .../resources/mapping/mapping-script-transform.xml |    0
 .../mapping/mapping-script-variables-groovy.xml    |    0
 .../mapping/mapping-script-variables-xpath.xml     |    0
 .../mapping/mapping-time-deferred-delete.xml       |    0
 .../resources/mapping/mapping-time-from-to.xml     |    0
 .../mapping/mapping-value-boolean-false.xml        |    0
 .../mapping/mapping-value-boolean-true.xml         |    0
 .../mapping/mapping-value-condition-false.xml      |    0
 .../mapping/mapping-value-condition-true.xml       |    0
 .../resources/mapping/mapping-value-multi-deep.xml |    0
 .../mapping/mapping-value-multi-shallow.xml        |    0
 .../mapping/mapping-value-single-deep.xml          |    0
 .../mapping/mapping-value-single-enum.xml          |    0
 .../mapping/mapping-value-single-shallow.xml       |    0
 .../src/test/resources/mapping/password-policy.xml |    0
 .../src/test/resources/mapping/user-jack.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-111111111111.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-111111111112.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-999111111122.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-999888111111.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-999888111112.xml       |    0
 .../c0c010c0-d34d-b33f-f00d-999888111113.xml       |    0
 .../src/test/resources/schema/extension.xsd        |    0
 model/model-common/testng.xml                      |   45 +++++++++++
 model/model-impl/pom.xml                           |    5 ++
 .../midpoint/model/expr/ExpressionHandler.java     |   16 ++--
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    5 +-
 .../midpoint/model/lens/AccountConstruction.java   |    6 +-
 .../midpoint/model/lens/AssignmentEvaluator.java   |    4 +-
 .../midpoint/model/lens/ChangeExecutor.java        |    6 +-
 .../evolveum/midpoint/model/lens/Clockwork.java    |    8 +-
 .../midpoint/model/lens/ItemValueWithOrigin.java   |    2 +-
 .../midpoint/model/lens/LensDebugListener.java     |    4 +-
 .../midpoint/model/lens/LensElementContext.java    |    3 +-
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    8 +-
 .../lens/projector/AccountValuesProcessor.java     |   10 +--
 .../model/lens/projector/ActivationProcessor.java  |    8 +-
 .../model/lens/projector/AssignmentProcessor.java  |    5 +-
 .../lens/projector/ConsolidationProcessor.java     |    2 +-
 .../model/lens/projector/CredentialsProcessor.java |   10 +--
 .../model/lens/projector/InboundProcessor.java     |   11 +--
 .../lens/projector/MappingEvaluationHelper.java    |    4 +-
 .../model/lens/projector/MappingInitializer.java   |    2 +-
 .../model/lens/projector/OutboundProcessor.java    |    8 +-
 .../lens/projector/ReconciliationProcessor.java    |    2 +-
 .../model/lens/projector/UserPolicyProcessor.java  |    8 +-
 .../model/security/UserDetailsServiceImpl.java     |    4 +-
 .../sync/CorrelationConfirmationEvaluator.java     |    8 +-
 model/model-impl/src/main/resources/ctx-model.xml  |   38 ++++-----
 .../midpoint/model/expr/TestModelExpressions.java  |    6 +-
 .../model/lens/TestAssignmentEvaluator.java        |    2 +-
 .../model/lens/TestAssignmentProcessor.java        |    3 +-
 .../model/util/mock/MockLensDebugListener.java     |    2 +-
 .../AbstractInitializedModelIntegrationTest.java   |    2 +-
 .../model/intest/TestModelServiceContract.java     |    6 +-
 .../intest/TestModelServiceContractDeprecated.java |    2 +-
 .../midpoint/model/intest/TestUserTemplate.java    |    2 +-
 .../intest/util/ProfilingLensDebugListener.java    |    2 +-
 model/notifications-impl/pom.xml                   |    5 ++
 .../api/transports/SimpleSmsTransport.java         |    8 +-
 .../notifications/handlers/BaseHandler.java        |    8 +-
 model/pom.xml                                      |    1 +
 .../InitializeLoopThroughApproversInLevel.java     |    8 +-
 .../processors/general/GeneralChangeProcessor.java |    8 +-
 .../provisioning/util/ProvisioningUtil.java        |    5 +-
 .../evolveum/midpoint/testing/story/TestTrafo.java |    2 +-
 223 files changed, 603 insertions(+), 720 deletions(-)
 copy infra/common/src/main/java/com/evolveum/midpoint/common/{expression/evaluator/LiteralExpressionEvaluatorFactory.java => StaticExpressionUtil.java} (52%)
 rename infra/common/src/test/java/com/evolveum/midpoint/common/{expression => }/TestStaticValues.java (91%)
 copy infra/common/src/test/resources/{crypto/test-keystore.jceks => keystore.jceks} (100%)
 create mode 100644 infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointTestConstants.java
 copy {infra/common => model/model-common}/.gitignore (100%)
 copy model/{ => model-common}/pom.xml (50%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/Expression.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionEvaluationContext.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionEvaluator.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionEvaluatorFactory.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionFactory.java (99%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionSyntaxException.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionUtil.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ExpressionVariables.java (99%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ItemDeltaItem.java (99%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/ObjectDeltaObject.java (99%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/Source.java (97%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/SourceTriple.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/StringPolicyResolver.java (94%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/AsIsExpressionEvaluator.java (92%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/AsIsExpressionEvaluatorFactory.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/AssignmentExpressionEvaluator.java (93%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/AssignmentExpressionEvaluatorFactory.java (93%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/GenerateExpressionEvaluator.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/LiteralExpressionEvaluator.java (90%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/LiteralExpressionEvaluatorFactory.java (56%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/PathExpressionEvaluator.java (93%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/evaluator/PathExpressionEvaluatorFactory.java (93%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/functions/BasicExpressionFunctions.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/functions/BasicExpressionFunctionsXPath.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/functions/FunctionLibrary.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/functions/LogExpressionFunctions.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptEvaluator.java (84%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptExpression.java (94%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptExpressionEvaluationContext.java (90%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptExpressionEvaluator.java (87%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptExpressionEvaluatorFactory.java (92%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/ScriptExpressionFactory.java (92%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/jsr223/Jsr223ScriptEvaluator.java (95%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/LazyXPathVariableResolver.java (97%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/MidPointNamespaceContext.java (96%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/ReflectionXPathFunctionResolver.java (92%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/ReflectionXPathFunctionWrapper.java (88%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/XPathExpressionCodeHolder.java (98%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/expression/script/xpath/XPathScriptEvaluator.java (97%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/mapping/Mapping.java (92%)
 rename {infra/common/src/main/java/com/evolveum/midpoint => model/model-common/src/main/java/com/evolveum/midpoint/model}/common/mapping/MappingFactory.java (82%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/ExpressionTestUtil.java (72%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/TestExpression.java (87%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/TestExpressionUtil.java (93%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/AbstractScriptTest.java (95%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/TestExpressionFunctions.java (99%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/TestGroovyExpressions.java (89%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/TestJavaScriptExpressions.java (85%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/TestScriptCaching.java (92%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/expression/script/TestXPathExpressions.java (83%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/MappingTestEvaluator.java (96%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestMappingComplex.java (76%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestMappingDynamicSimple.java (97%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestMappingDynamicSysVar.java (95%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestMappingStatic.java (97%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestMappingTime.java (85%)
 rename {infra/common/src/test/java/com/evolveum/midpoint => model/model-common/src/test/java/com/evolveum/midpoint/model}/common/mapping/TestValueConstructionAbsolute.java (96%)
 rename {infra/common => model/model-common}/src/test/resources/expression/expression/account-jack-dummy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/expression/iteration-condition.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/expression/user-jack.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/functions/account-jack.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/functions/resource-opendj.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/functions/user-jack.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-func-concatname.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-func.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-list.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-objectref-variables-polystring.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-objectref-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-simple.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-string-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-user-extension-ship.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-user-given-name.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/groovy/expression-user-stringify-full-name.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-func-concatname.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-func.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-list.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-objectref-variables-polystring.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-objectref-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-simple.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-string-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-user-extension-ship-path.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-user-extension-ship.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-user-given-name.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/javascript/expression-user-stringify-full-name.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-func-concatname.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-func.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-list.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-objectref-variables-polystring.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-objectref-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-root-node.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-simple.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-string-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-user-extension-ship-path.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-user-extension-ship.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-user-given-name.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/expression/xpath/expression-user-stringify-full-name.xml (100%)
 rename infra/common/src/test/resources/crypto/test-keystore.jceks => model/model-common/src/test/resources/keystore.jceks (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/account-inbound-mapping.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/account-jack.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-asis-password.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-asis-system-variables-polystring-norm.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-asis-system-variables-polystring-orig.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-asis.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-complex-captain.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-condition-nonempty.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-generate-policy-bad.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-generate-policy-numeric.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-generate-policy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-generate.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-inbound.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-npe.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-enum.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-extension-variable.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-system-variables-namespace.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-system-variables-nosource.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-system-variables-polystring-long.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-system-variables-polystring-short.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-path-system-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-date-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-extra-variables.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-fullname.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-list-absolute-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-list-absolute-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-list-relative-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-list-relative-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-root-node.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-simple-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-simple-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-empty-function.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-empty-single-function.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-empty-single.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-empty.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-sourcecontext-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-employee-number.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-employee-type.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-password-decrypt.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-password.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-norm.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-op.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-orig.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-system-variables-polystring-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-transform.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-variables-groovy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-script-variables-xpath.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-time-deferred-delete.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-time-from-to.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-boolean-false.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-boolean-true.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-condition-false.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-condition-true.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-multi-deep.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-multi-shallow.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-single-deep.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-single-enum.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/mapping-value-single-shallow.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/password-policy.xml (100%)
 rename {infra/common => model/model-common}/src/test/resources/mapping/user-jack.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-111111111111.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-111111111112.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999111111122.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111112.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml (100%)
 copy {infra/common => model/model-common}/src/test/resources/schema/extension.xsd (100%)
 create mode 100644 model/model-common/testng.xml


hooks/post-receive
-- 
midPoint


More information about the midPoint-svn mailing list