[midPoint-git] midPoint branch bootstrap updated. v2.3devel-803-ge4d9364

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  e4d936402d31fb9f9a090a83a6b1e00f8e3264d2 (commit) v2.3devel-803-ge4d9364
       via  2b94e9ee43940e655cf9e606f926015a625c1943 (commit) v2.3devel-482-g2b94e9e
       via  c955ba73783bbcb8579d6b181e67ca34f1ae449c (commit) v2.3devel-481-gc955ba7
       via  70dd278baf41a59c5bf7e31ffc1abe155e37c746 (commit) v2.3devel-480-g70dd278
       via  66829924be75879b5cc343ff735d5a0517ceebcc (commit) v2.3devel-479-g6682992
       via  4f1685a9302cb1305b8f4afd1015520fc1829bba (commit) v2.3devel-478-g4f1685a
       via  3c553a8ec30a110379d5be6c9f0b38b9628133c0 (commit) v2.3devel-477-g3c553a8e
      from  8ed37bb55d8de1b6bdc87dce729a1086f5142afa (commit) v2.3devel-796-g8ed37bb

- Log -----------------------------------------------------------------
commit e4d936402d31fb9f9a090a83a6b1e00f8e3264d2
Merge: 8ed37bb 2b94e9e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Jan 7 11:25:41 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java

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

(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:
 .../expression/ExpressionEvaluationContext.java    |   10 +
 .../midpoint/common/expression/ExpressionUtil.java |  171 ++++++++
 ...riptVariables.java => ExpressionVariables.java} |   21 +-
 .../expression/{script => }/SourceTriple.java      |    3 +-
 ...actValueTransformationExpressionEvaluator.java} |  118 +++---
 .../evaluator/AssignmentExpressionEvaluator.java   |  118 +++++-
 .../AssignmentExpressionEvaluatorFactory.java      |    8 +-
 .../evaluator/PathExpressionEvaluator.java         |   33 +-
 .../common/expression/script/ScriptEvaluator.java  |    3 +-
 .../common/expression/script/ScriptExpression.java |   10 +-
 .../script/ScriptExpressionEvaluationContext.java  |    7 +-
 .../script/ScriptExpressionEvaluator.java          |  448 +-------------------
 .../script/jsr223/Jsr223ScriptEvaluator.java       |    6 +-
 .../script/xpath/LazyXPathVariableResolver.java    |    6 +-
 .../script/xpath/XPathScriptEvaluator.java         |    7 +-
 .../evolveum/midpoint/common/mapping/Mapping.java  |    2 +
 .../expression/script/AbstractScriptTest.java      |   28 +-
 .../expression/script/TestScriptCaching.java       |    3 +-
 .../mapping/mapping-script-list-relative-xpath.xml |    3 +-
 .../midpoint/prism/ComplexTypeDefinition.java      |   30 +-
 .../com/evolveum/midpoint/prism/PrismContext.java  |    5 +
 .../midpoint/prism/schema/SchemaRegistry.java      |   25 +-
 .../midpoint/schema/util/ObjectResolver.java       |   17 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |  184 ++++----
 .../test/util/DirectoryFileObjectResolver.java     |   13 +
 model/model-impl/pom.xml                           |    6 +-
 .../midpoint/model/cleanup/CleanUpTaskHandler.java |    4 +
 .../evolveum/midpoint/model/lens/Clockwork.java    |    6 +-
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    4 +-
 .../sync/CorrelationConfirmationEvaluator.java     |  136 +-----
 model/model-impl/src/main/resources/ctx-model.xml  |    1 +
 .../midpoint/model/expr/TestModelExpressions.java  |   10 +-
 .../AbstractConfiguredModelIntegrationTest.java    |    1 +
 .../midpoint/model/intest/TestOrgStruct.java       |    4 -
 .../midpoint/model/intest/TestUserTemplate.java    |   78 +++-
 .../src/test/resources/logback-test.xml            |   16 +-
 model/pom.xml                                      |    1 +
 model/{model-api => report-api}/pom.xml            |   66 ++-
 .../midpoint/report/api}/ReportManager.java        |    7 +-
 model/report-impl/pom.xml                          |    7 +
 .../midpoint/report/ReportCreateTaskHandler.java   |    2 +-
 .../com/evolveum/midpoint/report/ReportUtils.java  |    4 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |   18 +-
 43 files changed, 798 insertions(+), 852 deletions(-)
 rename infra/common/src/main/java/com/evolveum/midpoint/common/expression/{script/ScriptVariables.java => ExpressionVariables.java} (92%)
 rename infra/common/src/main/java/com/evolveum/midpoint/common/expression/{script => }/SourceTriple.java (93%)
 copy infra/common/src/main/java/com/evolveum/midpoint/common/expression/{script/ScriptExpressionEvaluator.java => evaluator/AbstractValueTransformationExpressionEvaluator.java} (82%)
 copy model/{model-api => report-api}/pom.xml (58%)
 copy model/{report-impl/src/main/java/com/evolveum/midpoint/report => report-api/src/main/java/com/evolveum/midpoint/report/api}/ReportManager.java (89%)


hooks/post-receive
-- 
midPoint