[midPoint-git] [Evolveum/midpoint] 47fee8: Sketch of new definition wizard (some tabs fail wi...

Tue Jan 12 19:14:00 CET 2016

  Branch: refs/heads/feature/form-refactoring
  Home:   https://github.com/Evolveum/midpoint
  Commit: 47fee8b260d1773804288309c6c32888d52ad110
      https://github.com/Evolveum/midpoint/commit/47fee8b260d1773804288309c6c32888d52ad110
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Sketch of new definition wizard (some tabs fail with mysterious problems).


  Commit: d5052e857a3d4f38e2c2b2a0630c624562924ca8
      https://github.com/Evolveum/midpoint/commit/d5052e857a3d4f38e2c2b2a0630c624562924ca8
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java

  Log Message:
  -----------
  tabs are clickable without error


  Commit: 4396a5007716086db2fb697714a9eca94c61f891
      https://github.com/Evolveum/midpoint/commit/4396a5007716086db2fb697714a9eca94c61f891
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.java

  Log Message:
  -----------
  certification definition wizard: xml editor is set to readonly


  Commit: 14c313f721eb5c9dbdfba65232b178d24eb4c77d
      https://github.com/Evolveum/midpoint/commit/14c313f721eb5c9dbdfba65232b178d24eb4c77d
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  access certification definition wizard: Basic information panel, not finished yet


  Commit: df923c58774804cfb0aeaf51279402e8465f3260
      https://github.com/Evolveum/midpoint/commit/df923c58774804cfb0aeaf51279402e8465f3260
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-12 (Sat, 12 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  access certification definition wizard: Basic information panel, Owner field


  Commit: 2c74d8f17ea381a23fe880165029d402188c3429
      https://github.com/Evolveum/midpoint/commit/2c74d8f17ea381a23fe880165029d402188c3429
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-13 (Sun, 13 Dec 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M samples/certification/def-all-user-assignments.xml
    M samples/certification/def-role-inducements.xml
    A samples/certification/report-certification-campaigns.xml
    A samples/certification/report-certification-definitions.xml

  Log Message:
  -----------
  Preliminary certification reports.


  Commit: 508be0ab14b7c5bc6e9068ef4c5956789cb90aa0
      https://github.com/Evolveum/midpoint/commit/508be0ab14b7c5bc6e9068ef4c5956789cb90aa0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-13 (Sun, 13 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: 79fd71d31023c797401849ab0a15e9fd47babbf5
      https://github.com/Evolveum/midpoint/commit/79fd71d31023c797401849ab0a15e9fd47babbf5
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java

  Log Message:
  -----------
  access certification definition wizard: Scope definition tab panel, not finished yet


  Commit: b1d64464168448ba450acba03444e21952e42791
      https://github.com/Evolveum/midpoint/commit/b1d64464168448ba450acba03444e21952e42791
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java

  Log Message:
  -----------
  fixing problem on links panel on self dashboard page


  Commit: 41cbf087ecc26e40e3f1dcf701b3650206e1e465
      https://github.com/Evolveum/midpoint/commit/41cbf087ecc26e40e3f1dcf701b3650206e1e465
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: 91cea125181932c44cd473bf6c155ec35020ad53
      https://github.com/Evolveum/midpoint/commit/91cea125181932c44cd473bf6c155ec35020ad53
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  access certification : scope tab, not finished


  Commit: 52567d4f4c6464c6c040ef27eacc5c25f916100f
      https://github.com/Evolveum/midpoint/commit/52567d4f4c6464c6c040ef27eacc5c25f916100f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: ff4607c9f02dba0b25426da63060a79cfda8fc89
      https://github.com/Evolveum/midpoint/commit/ff4607c9f02dba0b25426da63060a79cfda8fc89
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java

  Log Message:
  -----------
  Saving campaign definition back to the repository.


  Commit: 6d124853a36cb54c3bc187dd51dc1da39612c04d
      https://github.com/Evolveum/midpoint/commit/6d124853a36cb54c3bc187dd51dc1da39612c04d
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java

  Log Message:
  -----------
  access certification : object type drop down


  Commit: 7a3a2f2d8ee626a6eb66d712a0770fbaee8d939b
      https://github.com/Evolveum/midpoint/commit/7a3a2f2d8ee626a6eb66d712a0770fbaee8d939b
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M samples/certification/def-all-user-assignments.xml
    M samples/certification/def-role-inducements.xml
    A samples/certification/report-certification-campaigns.xml
    A samples/certification/report-certification-definitions.xml

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: 78b8ad7f6ddafdd28a518f09dcd161e4c72bf718
      https://github.com/Evolveum/midpoint/commit/78b8ad7f6ddafdd28a518f09dcd161e4c72bf718
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ChangesRequested.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddEntitlementAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddEntitlement.java
    A model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    M model/workflow-impl/src/test/resources/common/resource-dummy.xml
    A model/workflow-impl/src/test/resources/user-jack-modify-add-entitlement-testers.xml

  Log Message:
  -----------
  Entitlements approval - interim commit.


  Commit: 0d5a06d0d6dbefd16b7f9b42b8954032bb1aa9e3
      https://github.com/Evolveum/midpoint/commit/0d5a06d0d6dbefd16b7f9b42b8954032bb1aa9e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddEntitlementAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java

  Log Message:
  -----------
  Entitlements approval - interim commit.


  Commit: da492d3aadbdf9bd2cad1645351c543058f4f682
      https://github.com/Evolveum/midpoint/commit/da492d3aadbdf9bd2cad1645351c543058f4f682
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ChangesRequested.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java

  Log Message:
  -----------
  Entitlements approval - interim commit.


  Commit: b1a615d3622dae2057d1217c2a5ae5d63ce5cbaa
      https://github.com/Evolveum/midpoint/commit/b1a615d3622dae2057d1217c2a5ae5d63ce5cbaa
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeObjectType.java

  Log Message:
  -----------
  access certification : scope definition tab.


  Commit: 97031dcd6650028d452d753ef647290e19bd4bf4
      https://github.com/Evolveum/midpoint/commit/97031dcd6650028d452d753ef647290e19bd4bf4
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java

  Log Message:
  -----------
  access certification : started stage definition tab implementation


  Commit: f574889b409c0f75b1b991d2229f67849b8cd037
      https://github.com/Evolveum/midpoint/commit/f574889b409c0f75b1b991d2229f67849b8cd037
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ChangesRequested.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ObjectTreeDeltas.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddEntitlement.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    A model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    M model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-entitlement-testers.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Workflow tests pass again. Basic add entitlement approval tests pass as well.


  Commit: 076f3cfa575f9a6d9f34363e8eb4a44e2a3600bf
      https://github.com/Evolveum/midpoint/commit/076f3cfa575f9a6d9f34363e8eb4a44e2a3600bf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeObjectType.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: 12f686522ac2bf179f716161d25b629a760e4be8
      https://github.com/Evolveum/midpoint/commit/12f686522ac2bf179f716161d25b629a760e4be8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ResourceListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseDeprecatedPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePageAwarePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractAssignableSelectionPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.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 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java


  Commit: 9ea865570249d57b26d17a735b713c8c3bbd612b
      https://github.com/Evolveum/midpoint/commit/9ea865570249d57b26d17a735b713c8c3bbd612b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    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/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java

  Log Message:
  -----------
  Fix for NPE in ACAttributeDto caused by missing prismContext (quite ugly, however).
Small fixes for entitlement approval GUI.


  Commit: 5b3614e918f185184b4976fd531343d02a4de25e
      https://github.com/Evolveum/midpoint/commit/5b3614e918f185184b4976fd531343d02a4de25e
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  access certification : started stage definition tab implementation


  Commit: 169db980f173193f20b80259cadf5657d03415db
      https://github.com/Evolveum/midpoint/commit/169db980f173193f20b80259cadf5657d03415db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Fixing some NPEs.


  Commit: 39b2d208162735adf1629ab9a7881b1747a529d8
      https://github.com/Evolveum/midpoint/commit/39b2d208162735adf1629ab9a7881b1747a529d8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java


  Commit: 4e52ae281c9c53c85f9e1d6d7fbca8f28b0e2e90
      https://github.com/Evolveum/midpoint/commit/4e52ae281c9c53c85f9e1d6d7fbca8f28b0e2e90
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.java

  Log Message:
  -----------
  Using ChooseTypePanel to view/edit campaign owner.


  Commit: a0b06d57545b0ce50a911518db019ffce04f7758
      https://github.com/Evolveum/midpoint/commit/a0b06d57545b0ce50a911518db019ffce04f7758
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java

  Log Message:
  -----------
  access certification :  stage definition tab implementation


  Commit: 1fbc84a70e16ff5b87138a7633b1ed07067baab1
      https://github.com/Evolveum/midpoint/commit/1fbc84a70e16ff5b87138a7633b1ed07067baab1
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    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/component/assignment/ResourceListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseDeprecatedPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePageAwarePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractAssignableSelectionPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.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/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ObjectTreeDeltas.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddEntitlement.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    A model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    M model/workflow-impl/src/test/resources/common/resource-dummy.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: b102c4eb17a2ee06a5b660f57e42b5501f0a92b9
      https://github.com/Evolveum/midpoint/commit/b102c4eb17a2ee06a5b660f57e42b5501f0a92b9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddEntitlement.java
    A model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Entitlements approval - applicability of approvals is now configurable.


  Commit: e0f2b7a21c0d9d65b50f634bb735c5903aae2f38
      https://github.com/Evolveum/midpoint/commit/e0f2b7a21c0d9d65b50f634bb735c5903aae2f38
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/ManagerSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml

  Log Message:
  -----------
  access certification :  continue stage definition tab implementation


  Commit: 515ee4b9be6f06d8373f0a3de5ddec24a31fe01f
      https://github.com/Evolveum/midpoint/commit/515ee4b9be6f06d8373f0a3de5ddec24a31fe01f
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddEntitlementAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddEntitlement.java
    A model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: 4ab0f492331404af0812eed87891a906af386694
      https://github.com/Evolveum/midpoint/commit/4ab0f492331404af0812eed87891a906af386694
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  access certification :  almost finished stage definition tab implementation


  Commit: ce370662178f9413db9905076733f62396982138
      https://github.com/Evolveum/midpoint/commit/ce370662178f9413db9905076733f62396982138
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java

  Log Message:
  -----------
  Search filter text editor. Implemented defaults for boolean-typed scope properties.


  Commit: 762622ee3bcc817957b210b8c0814e71b7163e22
      https://github.com/Evolveum/midpoint/commit/762622ee3bcc817957b210b8c0814e71b7163e22
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: b79b503612ea4467e0469273d7cb2583952aa662
      https://github.com/Evolveum/midpoint/commit/b79b503612ea4467e0469273d7cb2583952aa662
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Slight modification of labels for stage definition


  Commit: 3d0105e18e02880311fa2e61c4e57ea88d556ade
      https://github.com/Evolveum/midpoint/commit/3d0105e18e02880311fa2e61c4e57ea88d556ade
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Last campaign start & close. Removed unimplemented items.


  Commit: 432a0e18523a2661ed45de08da3a32bb13b16fa6
      https://github.com/Evolveum/midpoint/commit/432a0e18523a2661ed45de08da3a32bb13b16fa6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Approval strategy drop down box with localized names.


  Commit: f340065d77c16f19f6245a53f6aac839df224034
      https://github.com/Evolveum/midpoint/commit/f340065d77c16f19f6245a53f6aac839df224034
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java

  Log Message:
  -----------
  access certification :   finished stage definition tab implementation


  Commit: 2a1359e889c931d92ada6a8241b23760406d9b4a
      https://github.com/Evolveum/midpoint/commit/2a1359e889c931d92ada6a8241b23760406d9b4a
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java

  Log Message:
  -----------
  certification wizard is finished


  Commit: 634806552d6560497ae76e77b84a064c57955eb2
      https://github.com/Evolveum/midpoint/commit/634806552d6560497ae76e77b84a064c57955eb2
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  certification wizard some addition changes


  Commit: 674689a0262b10aee887d9ae479839cbdad4fdff
      https://github.com/Evolveum/midpoint/commit/674689a0262b10aee887d9ae479839cbdad4fdff
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

  Log Message:
  -----------
  Merge branch 'master' into access-certification


  Commit: 9bf0fc892ae8746c38526a96a7c93019f16ab862
      https://github.com/Evolveum/midpoint/commit/9bf0fc892ae8746c38526a96a7c93019f16ab862
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java

  Log Message:
  -----------
  added possibility to create new stage definition


  Commit: c91e17c667838a2a6e1d9f8c1aa604f5a78884c4
      https://github.com/Evolveum/midpoint/commit/c91e17c667838a2a6e1d9f8c1aa604f5a78884c4
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: ae76534f5ca253241b20422322e45889387469ce
      https://github.com/Evolveum/midpoint/commit/ae76534f5ca253241b20422322e45889387469ce
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java

  Log Message:
  -----------
  "New campaign definition" implemented using wizard.


  Commit: 698905664729e62a7a010c324393bf680ea9fac7
      https://github.com/Evolveum/midpoint/commit/698905664729e62a7a010c324393bf680ea9fac7
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  updated style for button on stage def panel


  Commit: e4f5a44e2978bdb8a0dab681a63ebba8195243ac
      https://github.com/Evolveum/midpoint/commit/e4f5a44e2978bdb8a0dab681a63ebba8195243ac
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: e7d634b730309fe96e07f56ed7699101dde1630e
      https://github.com/Evolveum/midpoint/commit/e7d634b730309fe96e07f56ed7699101dde1630e
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  added definition name validation


  Commit: 360e123e791fed6ec4bb8b6fb649c75be0ced8cf
      https://github.com/Evolveum/midpoint/commit/360e123e791fed6ec4bb8b6fb649c75be0ced8cf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  A couple of fixes + DTO support for remediation style.


  Commit: 370efff35b2e126cfe087159a1f9d894286a3771
      https://github.com/Evolveum/midpoint/commit/370efff35b2e126cfe087159a1f9d894286a3771
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: a8e4ecc065a55e3024d1731cbd7d46ef76c5b5cc
      https://github.com/Evolveum/midpoint/commit/a8e4ecc065a55e3024d1731cbd7d46ef76c5b5cc
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java

  Log Message:
  -----------
  temp commit


  Commit: 6fe2d749208ecb1a0fc725bf066ed82cc751ac41
      https://github.com/Evolveum/midpoint/commit/6fe2d749208ecb1a0fc725bf066ed82cc751ac41
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: 47ef1bf68993fa3c88b88679d54975ce71d084cb
      https://github.com/Evolveum/midpoint/commit/47ef1bf68993fa3c88b88679d54975ce71d084cb
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  remediation drop-down is added


  Commit: b66a371e5ddd14bb05dcff2e98e18423d69be142
      https://github.com/Evolveum/midpoint/commit/b66a371e5ddd14bb05dcff2e98e18423d69be142
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Showing assigned reviewers for a case in order to make misconfigurations resulting in 'no reviewers' obvious.


  Commit: 86624f6b72db783d7f596bcfafd0f7a517f51226
      https://github.com/Evolveum/midpoint/commit/86624f6b72db783d7f596bcfafd0f7a517f51226
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java

  Log Message:
  -----------
  Merge branch 'access-certification' of github.com:Evolveum/midpoint into access-certification


  Commit: 66794a559b58d2885256680b6432c42676008a5e
      https://github.com/Evolveum/midpoint/commit/66794a559b58d2885256680b6432c42676008a5e
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java

  Log Message:
  -----------
  some changes to tabs work on the access cert page


  Commit: c9e5535faa1140ecd7845b57b9cbc2d90c0669ba
      https://github.com/Evolveum/midpoint/commit/c9e5535faa1140ecd7845b57b9cbc2d90c0669ba
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: 9260acf6f98ea8bce917a95148be5869b959bd1d
      https://github.com/Evolveum/midpoint/commit/9260acf6f98ea8bce917a95148be5869b959bd1d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java

  Log Message:
  -----------
  Fixed starting stages with no duration. Fixed "in remediation" eternal state problem.


  Commit: cf597a237dbaed416d92fc49d2d2999ea440429c
      https://github.com/Evolveum/midpoint/commit/cf597a237dbaed416d92fc49d2d2999ea440429c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java

  Log Message:
  -----------
  Changed default stage name (new convention).


  Commit: 75c09dfa6c7796a0784e1f0199e3b325fc007e33
      https://github.com/Evolveum/midpoint/commit/75c09dfa6c7796a0784e1f0199e3b325fc007e33
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java

  Log Message:
  -----------
  some changes to tabs work on the access cert page


  Commit: 86ed5ab9d9aa7d3f85678a0515185a856a3cd37d
      https://github.com/Evolveum/midpoint/commit/86ed5ab9d9aa7d3f85678a0515185a856a3cd37d
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java

  Log Message:
  -----------
  Merge branch 'access-certification' of https://github.com/Evolveum/midpoint into access-certification


  Commit: 4a77515420842625bbe4359f2761614afba9610c
      https://github.com/Evolveum/midpoint/commit/4a77515420842625bbe4359f2761614afba9610c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java

  Log Message:
  -----------
  Merge branch 'master' into access-certification


  Commit: 0edad99ca813b180e40103f0b023cd39bb50f69b
      https://github.com/Evolveum/midpoint/commit/0edad99ca813b180e40103f0b023cd39bb50f69b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css
    M gui/admin-gui/src/main/webapp/js/ace/ace.js
    M gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-assign-requestable-roles.xml
    M model/model-intest/src/test/resources/security/role-business-1.xml
    A model/model-intest/src/test/resources/security/role-business-2.xml

  Log Message:
  -----------
  Merge branch 'master' into access-certification


  Commit: cd221466468e437f7640157e0924aaf2e490f833
      https://github.com/Evolveum/midpoint/commit/cd221466468e437f7640157e0924aaf2e490f833
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Temporarily reenabled old query interpreter to diagnose recent problems in tests.


  Commit: 6362376bfa2e6ff2a7fac3439d19fbc5dd79b7e8
      https://github.com/Evolveum/midpoint/commit/6362376bfa2e6ff2a7fac3439d19fbc5dd79b7e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M config/initial-objects/090-report-audit.xml
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/MoreDialogDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ObjectBrowserDialog.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ObjectBrowserDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFragmentBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPopoverDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractAssignableSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractTreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgSelectionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Merge branch 'master' into access-certification


  Commit: 6d9341ef575f94c701b31b01260ad055612b70de
      https://github.com/Evolveum/midpoint/commit/6d9341ef575f94c701b31b01260ad055612b70de
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M repo/repo-sql-impl-test/testng-integration.xml

  Log Message:
  -----------
  Eliminating currently irrelevant test.


  Commit: 47c1005530a0c5a87ae3cfd5aa2197a26b6caeaa
      https://github.com/Evolveum/midpoint/commit/47c1005530a0c5a87ae3cfd5aa2197a26b6caeaa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M repo/repo-sql-impl-test/testng-integration.xml

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


  Commit: 3d53123d2acdfb7ba9324ffd3a9a992521c9dfcb
      https://github.com/Evolveum/midpoint/commit/3d53123d2acdfb7ba9324ffd3a9a992521c9dfcb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    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/component/form/ValueChoosePanel.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/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionXmlPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageDefinitionPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeObjectType.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/ManagerSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
    M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ObjectTreeDeltas.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    A model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    M model/workflow-impl/src/test/resources/common/resource-dummy.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl-test/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Merge branch 'master' into feature/form-refactoring

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java


  Commit: 25cd483e0a5a7fda891f7c932bd2809be57ab00c
      https://github.com/Evolveum/midpoint/commit/25cd483e0a5a7fda891f7c932bd2809be57ab00c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java

  Log Message:
  -----------
  Post-merge compilation fixes.


Compare: https://github.com/Evolveum/midpoint/compare/e2cd36582098...25cd483e0a5a