[midPoint-git] midPoint branch master updated. v2.3devel-973-g8d3d686

[Radovan Semancik]

Project "midPoint" branch master has been updated
       via  8d3d686e5fb01d0af561921b29080b801e2d6142 (commit) v2.3devel-973-g8d3d686
      from  abfd19d467516f004da237d79468860b27a7fdc9 (commit) v2.3devel-972-gabfd19d

- Log -----------------------------------------------------------------
commit 8d3d686e5fb01d0af561921b29080b801e2d6142
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Mon Jan 20 22:49:18 2014 +0100

    associationFromLink expression, some more refactoring, fixing and tests

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

(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:
 .../refinery/LayerRefinedAttributeDefinition.java  |   55 +++++++
 .../refinery/RefinedAssociationDefinition.java     |    6 +
 .../refinery/RefinedAttributeDefinition.java       |   15 +-
 .../schema/constants/ExpressionConstants.java      |    3 +
 .../midpoint/schema/util/ObjectResolver.java       |    3 +-
 .../midpoint/schema/util/ResourceTypeUtil.java     |    2 +-
 .../evolveum/midpoint/schema/util/ShadowUtil.java  |   17 +++
 .../resources/xml/ns/public/common/common-2a.xsd   |   40 ++++-
 .../test/util/DirectoryFileObjectResolver.java     |    6 +-
 .../model/common/expression/Expression.java        |    2 +-
 .../expression/ExpressionEvaluationContext.java    |   10 ++
 .../model/common/expression/ExpressionUtil.java    |    2 +-
 .../AbstractSearchExpressionEvaluator.java         |   14 +-
 .../evaluator/AssignmentExpressionEvaluator.java   |    5 +-
 .../evaluator/AssociationExpressionEvaluator.java  |   20 ++-
 .../AssociationFromLinkExpressionEvaluator.java    |  158 ++++++++++++++++++++
 ...ciationFromLinkExpressionEvaluatorFactory.java} |   16 +-
 .../GenerateExpressionEvaluatorFactory.java        |    2 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |    2 +-
 .../script/xpath/LazyXPathVariableResolver.java    |    2 +-
 .../midpoint/model/common/mapping/Mapping.java     |    2 +
 .../midpoint/model/ModelObjectResolver.java        |   18 ++-
 .../evolveum/midpoint/model/lens/Construction.java |   13 +-
 .../com/evolveum/midpoint/model/lens/LensUtil.java |   32 +++-
 .../lens/projector/ConsolidationProcessor.java     |   15 +-
 .../model/lens/projector/FocusPolicyProcessor.java |    8 +-
 .../model/lens/projector/OutboundProcessor.java    |   12 +-
 model/model-impl/src/main/resources/ctx-model.xml  |   10 ++
 .../AbstractConfiguredModelIntegrationTest.java    |    2 +-
 .../midpoint/model/intest/TestActivation.java      |    2 +-
 .../midpoint/model/intest/TestEntitlements.java    |   56 ++++++-
 .../midpoint/model/intest/TestUserTemplate.java    |    2 +-
 .../src/test/resources/common/resource-dummy.xml   |    1 +
 .../{role-swashbuckler.xml => role-wimp.xml}       |   41 +++--
 .../src/test/resources/logback-test.xml            |    2 +-
 .../model/test/AbstractModelIntegrationTest.java   |    4 +
 .../midpoint/test/IntegrationTestTools.java        |    4 +
 37 files changed, 521 insertions(+), 83 deletions(-)
 create mode 100644 model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
 copy model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/{AssociationExpressionEvaluatorFactory.java => AssociationFromLinkExpressionEvaluatorFactory.java} (76%)
 copy model/model-intest/src/test/resources/entitlements/{role-swashbuckler.xml => role-wimp.xml} (63%)


hooks/post-receive
-- 
midPoint