[midPoint-git] [Evolveum/midpoint] fcb2a3: Yet another sample fix to make build work

[Ivan Noris]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: fcb2a325635e4d33c5dcc5ddfc9964d3014450fe
      https://github.com/Evolveum/midpoint/commit/fcb2a325635e4d33c5dcc5ddfc9964d3014450fe
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M samples/demo/opendj.xml

  Log Message:
  -----------
  Yet another sample fix to make build work


  Commit: 68a75035973acb20f7cb1f851c65de24f3793335
      https://github.com/Evolveum/midpoint/commit/68a75035973acb20f7cb1f851c65de24f3793335
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/8a8baa739932...68a75035973a