[midPoint-git] [Evolveum/midpoint] 838939: small fix for delegations

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8389396faaea894f5b58022cc0fb49bf00a762e4
      https://github.com/Evolveum/midpoint/commit/8389396faaea894f5b58022cc0fb49bf00a762e4
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  small fix for delegations


  Commit: 565ed8df9ded087688d7d9a63277219e9e56c5c4
      https://github.com/Evolveum/midpoint/commit/565ed8df9ded087688d7d9a63277219e9e56c5c4
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
    A infra/schema/src/test/resources/common/xml/ns/metarole.xml
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    A model/model-impl/src/test/resources/lens/role-corp-auth.xml
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/metarole-security.xml
    R model/workflow-impl/src/test/resources/policy/metarole1.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
    A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
    A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M model/workflow-impl/src/test/resources/policy/user-lead2.xml
    M model/workflow-impl/src/test/resources/policy/user-lead3.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
    A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M tools/repo-ninja/pom.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/bebd5725096c...565ed8df9ded