[midPoint-git] [Evolveum/midpoint] 64e683: Mapping range is checked only if condition is true...

Wed Apr 5 15:33:55 CEST 2017

  Branch: refs/heads/extended-3.5
  Home:   https://github.com/Evolveum/midpoint
  Commit: 64e68385f3c5ac769e6042c46cf74ca64d1496fd
      https://github.com/Evolveum/midpoint/commit/64e68385f3c5ac769e6042c46cf74ca64d1496fd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

  Log Message:
  -----------
  Mapping range is checked only if condition is true (old or new one).

(cherry picked from commit 2c8c07a)


  Commit: 89db02b152a04ff8edca7d738b7b3656f5095865
      https://github.com/Evolveum/midpoint/commit/89db02b152a04ff8edca7d738b7b3656f5095865
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.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-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


  Commit: 0e2cb8eefa665347604bacb8f36336f9cf081237
      https://github.com/Evolveum/midpoint/commit/0e2cb8eefa665347604bacb8f36336f9cf081237
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  disabled subscription footer


  Commit: 1b4311985db59e1c9f5207db4c1c24c74781ec65
      https://github.com/Evolveum/midpoint/commit/1b4311985db59e1c9f5207db4c1c24c74781ec65
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java

  Log Message:
  -----------
  Bulk actions should now respond to "task going down" situation.

(cherry picked from commit 14fb862)


  Commit: e4db26b527eb854d2c15afdb933c659207fe9835
      https://github.com/Evolveum/midpoint/commit/e4db26b527eb854d2c15afdb933c659207fe9835
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


  Commit: 8fbfaf80dde306f29702d78f5dd79648d26fb0ff
      https://github.com/Evolveum/midpoint/commit/8fbfaf80dde306f29702d78f5dd79648d26fb0ff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

  Log Message:
  -----------
  Fixed searching by enums in extensions: MID-3801 (ActivationStatusType cannot be cast to java.lang.String)


  Commit: 1b8e61839e05ba5edc03e79b981926c5b38507b7
      https://github.com/Evolveum/midpoint/commit/1b8e61839e05ba5edc03e79b981926c5b38507b7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    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/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java

  Log Message:
  -----------
  MID-3690 fix for url pattern matching in security

(cherry picked from commit 3cb2436)


  Commit: 55f1aa9250c0f08659d2f50b21689c60e45c735f
      https://github.com/Evolveum/midpoint/commit/55f1aa9250c0f08659d2f50b21689c60e45c735f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  update gitignore


  Commit: 30b30683e1f794f4d1cc17a731066726cc1af3a5
      https://github.com/Evolveum/midpoint/commit/30b30683e1f794f4d1cc17a731066726cc1af3a5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A samples/tasks/bulk-actions/continue-on-any-error.xml

  Log Message:
  -----------
  Implemented MID-3809: "continue on any error" bulk actions option

(cherry picked from commit 6aadf67)


  Commit: 6a4bbb58de0227550afff62358ded2a5403b82ca
      https://github.com/Evolveum/midpoint/commit/6a4bbb58de0227550afff62358ded2a5403b82ca
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M .gitignore
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    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/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


  Commit: ac7a3a50e50b0c34118354b76bc3b419264c2bd6
      https://github.com/Evolveum/midpoint/commit/ac7a3a50e50b0c34118354b76bc3b419264c2bd6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

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

  Log Message:
  -----------
  fixed build


  Commit: 36737e369745a8c2107c3aa25bffbf94078f8a02
      https://github.com/Evolveum/midpoint/commit/36737e369745a8c2107c3aa25bffbf94078f8a02
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java

  Log Message:
  -----------
  MID-3690 fixed url matching. Fixed redirect to previous page (unauthenticated) after login.

(cherry picked from commit 789c318)


  Commit: b76c91b8d548cdc2cb42445b20ff0ba62f26f4b1
      https://github.com/Evolveum/midpoint/commit/b76c91b8d548cdc2cb42445b20ff0ba62f26f4b1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    A samples/evolveum/evolveum-net.aci
    A samples/evolveum/evolveum-net.ldif
    A samples/evolveum/hr.csv
    A samples/evolveum/midpoint.schema
    A samples/evolveum/object-template-user.xml
    M samples/evolveum/org-users.xml
    M samples/evolveum/posixgroups.ldif
    A samples/evolveum/resource-hr.xml
    M samples/evolveum/resource-openldap.xml
    M samples/evolveum/role-catalog.xml
    M samples/evolveum/roles.xml

  Log Message:
  -----------
  Improved Evolveum sample/demo


  Commit: b3acbdc48a44be5bb86f03405d2d0bf923a85582
      https://github.com/Evolveum/midpoint/commit/b3acbdc48a44be5bb86f03405d2d0bf923a85582
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M samples/evolveum/org-users.xml

  Log Message:
  -----------
  Evolveum sample: delegated administration


  Commit: bf17b35dca60fbb8ed931ff38704ea15c4bf1d92
      https://github.com/Evolveum/midpoint/commit/bf17b35dca60fbb8ed931ff38704ea15c4bf1d92
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  Better test for orgRelation


  Commit: f18815af9486ef1d1cf65679f259cecf1ba44c7e
      https://github.com/Evolveum/midpoint/commit/f18815af9486ef1d1cf65679f259cecf1ba44c7e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixing orgRelation autohorization in case of multiple relations to multiple orgs.


  Commit: 1502f1ca03f2b672ca242bf8a6f637eb1ab9299d
      https://github.com/Evolveum/midpoint/commit/1502f1ca03f2b672ca242bf8a6f637eb1ab9299d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml

  Log Message:
  -----------
  Permission to read workflow status of tasks


  Commit: 445184b599c14759c082650f9f47d0457627ffaa
      https://github.com/Evolveum/midpoint/commit/445184b599c14759c082650f9f47d0457627ffaa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M samples/evolveum/org-users.xml

  Log Message:
  -----------
  Improved Evolveum sample


  Commit: 2092d6d89c0630e1643eac75160928b2710da196
      https://github.com/Evolveum/midpoint/commit/2092d6d89c0630e1643eac75160928b2710da196
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M samples/evolveum/role-catalog.xml

  Log Message:
  -----------
  making samples schema-compliant


  Commit: 13ccbfb6fc36d6ce1cd2fbb049360f5a29e94dcb
      https://github.com/Evolveum/midpoint/commit/13ccbfb6fc36d6ce1cd2fbb049360f5a29e94dcb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java

  Log Message:
  -----------
  Increased timeout for task test 016.

(cherry picked from commit 59a04ec)


  Commit: ac340c4f71a14ef939049da0c3d2205327f4c39f
      https://github.com/Evolveum/midpoint/commit/ac340c4f71a14ef939049da0c3d2205327f4c39f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    A samples/evolveum/evolveum-net.aci
    A samples/evolveum/evolveum-net.ldif
    A samples/evolveum/hr.csv
    A samples/evolveum/midpoint.schema
    A samples/evolveum/object-template-user.xml
    M samples/evolveum/org-users.xml
    M samples/evolveum/posixgroups.ldif
    A samples/evolveum/resource-hr.xml
    M samples/evolveum/resource-openldap.xml
    M samples/evolveum/role-catalog.xml
    M samples/evolveum/roles.xml

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


  Commit: 0473e6e2c9a701b1c38b06fd33e3cd640c2cf3c3
      https://github.com/Evolveum/midpoint/commit/0473e6e2c9a701b1c38b06fd33e3cd640c2cf3c3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

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

  Log Message:
  -----------
  self dashboard page fix


  Commit: 0a91df6f36830bcaa1142447b75eb8aabbcf73c1
      https://github.com/Evolveum/midpoint/commit/0a91df6f36830bcaa1142447b75eb8aabbcf73c1
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M .gitignore
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    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/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    A samples/evolveum/evolveum-net.aci
    A samples/evolveum/evolveum-net.ldif
    A samples/evolveum/hr.csv
    A samples/evolveum/midpoint.schema
    A samples/evolveum/object-template-user.xml
    M samples/evolveum/org-users.xml
    M samples/evolveum/posixgroups.ldif
    A samples/evolveum/resource-hr.xml
    M samples/evolveum/resource-openldap.xml
    M samples/evolveum/role-catalog.xml
    M samples/evolveum/roles.xml
    A samples/tasks/bulk-actions/continue-on-any-error.xml

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


  Commit: b5fd10c3bb47d23d9ed2c0c80278ada6653e553f
      https://github.com/Evolveum/midpoint/commit/b5fd10c3bb47d23d9ed2c0c80278ada6653e553f
  Author: honchar <honchar at evolveum.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

  Log Message:
  -----------
  role catalog: fixed reading of the system configuration object for end user


  Commit: ba953a333fb9f0ec155853a2090eaa35b9650bf9
      https://github.com/Evolveum/midpoint/commit/ba953a333fb9f0ec155853a2090eaa35b9650bf9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

  Log Message:
  -----------
  Fixing projection password policy (MID-3769)


  Commit: b79d9bfcaeb65c778f0e324c5f92eca014bf287d
      https://github.com/Evolveum/midpoint/commit/b79d9bfcaeb65c778f0e324c5f92eca014bf287d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java

  Log Message:
  -----------
  (Hopefully) fixed EqualFilter.match when matching multi-valued item.

(cherry picked from commit 21ecbc3)


  Commit: 22f5893f1b65c13ad597862b668280010a5b96f1
      https://github.com/Evolveum/midpoint/commit/22f5893f1b65c13ad597862b668280010a5b96f1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfAssignments.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


  Commit: d9fcb1f6bfa2862dbbb6676fe391516f0fdf99f0
      https://github.com/Evolveum/midpoint/commit/d9fcb1f6bfa2862dbbb6676fe391516f0fdf99f0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java

  Log Message:
  -----------
  Fixing handling of attributes related to auxiliary object classes (MID-3535)


  Commit: 9c0d0b59fd00383786ebe6c96f179d65d97d2602
      https://github.com/Evolveum/midpoint/commit/9c0d0b59fd00383786ebe6c96f179d65d97d2602
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/security/role-assign-application-roles.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ItemSecurityDecisions.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Improving #assign authorizations


  Commit: b09a5e1295b0c38e2b2c97a531fa834431d9a451
      https://github.com/Evolveum/midpoint/commit/b09a5e1295b0c38e2b2c97a531fa834431d9a451
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Switching to LDAP connector 1.4.4-SNAPSHOT


  Commit: 4d43c2dbf251f43ee125233a3863b04ccd66d4f0
      https://github.com/Evolveum/midpoint/commit/4d43c2dbf251f43ee125233a3863b04ccd66d4f0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M .gitignore
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    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/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfAssignments.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.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/MidPointGuiAuthorizationEvaluator.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/password/password-policy-ugly.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
    M model/model-intest/src/test/resources/security/role-assign-application-roles.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ItemSecurityDecisions.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    A samples/evolveum/evolveum-net.aci
    A samples/evolveum/evolveum-net.ldif
    A samples/evolveum/hr.csv
    A samples/evolveum/midpoint.schema
    A samples/evolveum/object-template-user.xml
    M samples/evolveum/org-users.xml
    M samples/evolveum/posixgroups.ldif
    A samples/evolveum/resource-hr.xml
    M samples/evolveum/resource-openldap.xml
    M samples/evolveum/role-catalog.xml
    M samples/evolveum/roles.xml
    A samples/tasks/bulk-actions/continue-on-any-error.xml

  Log Message:
  -----------
  Merge branch 'support-3.5' into extended-3.5


Compare: https://github.com/Evolveum/midpoint/compare/d1bbd27a9242...4d43c2dbf251