[midPoint-git] [Evolveum/midpoint] 0352b2: Small doc fix.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0352b264c0e799f190ba52d5d95fd9229819ccd0
      https://github.com/Evolveum/midpoint/commit/0352b264c0e799f190ba52d5d95fd9229819ccd0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd

  Log Message:
  -----------
  Small doc fix.


  Commit: 65d40fa98d2ae1cb1771fa467b2ac9f3131d57f9
      https://github.com/Evolveum/midpoint/commit/65d40fa98d2ae1cb1771fa467b2ac9f3131d57f9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java

  Log Message:
  -----------
  Now really fixed the NPE.

(cherry picked from commit ee0a5c3)


  Commit: f7e69b64ca8344ed4e59349660f4f771ae309ae5
      https://github.com/Evolveum/midpoint/commit/f7e69b64ca8344ed4e59349660f4f771ae309ae5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/locale.properties

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


  Commit: 4b1488e4dc7ae47cc0e32ab85a7e6dca9530827f
      https://github.com/Evolveum/midpoint/commit/4b1488e4dc7ae47cc0e32ab85a7e6dca9530827f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationApiConstants.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/BaseCertificationHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/ExclusionCertificationHandler.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    A model/certification-impl/src/test/resources/sod/a-test-2a.xml
    A model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-3a.xml
    A model/certification-impl/src/test/resources/sod/a-test-3b.xml
    A model/certification-impl/src/test/resources/sod/a-test-3x.xml
    A model/certification-impl/src/test/resources/sod/a-test-3y.xml
    A model/certification-impl/src/test/resources/sod/sod-certification.xml

  Log Message:
  -----------
  Skeleton of SoD certification handler.


  Commit: 96b733aa791da154ab6a4ee7dc51239b422c1229
      https://github.com/Evolveum/midpoint/commit/96b733aa791da154ab6a4ee7dc51239b422c1229
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java

  Log Message:
  -----------
  Storing policy situation in focus/assignment - interim commit.


  Commit: 75d58df7c44f5d7a6b61438e3aad7f4ef304181d
      https://github.com/Evolveum/midpoint/commit/75d58df7c44f5d7a6b61438e3aad7f4ef304181d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    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

  Log Message:
  -----------
  Temporarily disabled policy situation updating on master.


  Commit: 31a356654bb5237680d878648dccfba1ceb7ffed
      https://github.com/Evolveum/midpoint/commit/31a356654bb5237680d878648dccfba1ceb7ffed
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/AbstractOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java


Compare: https://github.com/Evolveum/midpoint/compare/dfaa312f5411...31a356654bb5