[midPoint-git] [Evolveum/midpoint] 132386: data protection schema extension

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 132386adc3b135d4e87365b4a88cdfe268b04523
      https://github.com/Evolveum/midpoint/commit/132386adc3b135d4e87365b4a88cdfe268b04523
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  data protection schema extension


  Commit: e74de4248c799b890e5d563af18c65c1a014b677
      https://github.com/Evolveum/midpoint/commit/e74de4248c799b890e5d563af18c65c1a014b677
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/DefaultReferencableImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    M 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/expr/MidpointFunctions.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/AssignmentPathUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.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/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    A testing/story/src/test/resources/delivery/roles/role-it-3.xml
    A testing/story/src/test/resources/delivery/rules/k10-cc-1900-rem-administrator.xml
    M testing/story/src/test/resources/delivery/rules/k10-tpu-10-rem-elaine.xml
    M testing/story/src/test/resources/delivery/rules/k10-tpu-10.xml
    M testing/story/src/test/resources/delivery/rules/k10.xml

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

Conflicts:
	infra/schema/src/main/resources/localization/schema.properties


Compare: https://github.com/Evolveum/midpoint/compare/559be141a7cb...e74de4248c79