[midPoint-git] [Evolveum/midpoint] a08637: Default value for assignmentTargetSearch - work in...

Pavol Mederly mederly at evolveum.com
Tue Feb 7 00:20:06 CET 2017


  Branch: refs/heads/feature/escalation
  Home:   https://github.com/Evolveum/midpoint
  Commit: a0863736c20f29d49ebdcae09dea829f2dbbe8fb
      https://github.com/Evolveum/midpoint/commit/a0863736c20f29d49ebdcae09dea829f2dbbe8fb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    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/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml

  Log Message:
  -----------
  Default value for assignmentTargetSearch - work in progress (MID-3545)


  Commit: c08a71089f10882282bc203917679d6595d75123
      https://github.com/Evolveum/midpoint/commit/c08a71089f10882282bc203917679d6595d75123
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/TargetAcceptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/TargetAndFormAcceptor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/main/resources/mybatis/Task.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    M model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    M model/workflow-impl/testng-integration.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java

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


  Commit: 0340cd97b653ac756b3e28d422fce798c7c5786d
      https://github.com/Evolveum/midpoint/commit/0340cd97b653ac756b3e28d422fce798c7c5786d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java

  Log Message:
  -----------
  Default value in assignmentTargetSearch (MID-3545)


  Commit: 2702cb048d013af7f4d6487687c32591506588d7
      https://github.com/Evolveum/midpoint/commit/2702cb048d013af7f4d6487687c32591506588d7
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    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/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Role catalog: target user selection panel is added


  Commit: 555200a07d750acd741dd15feb1ca9cdfeb189f1
      https://github.com/Evolveum/midpoint/commit/555200a07d750acd741dd15feb1ca9cdfeb189f1
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/TargetAcceptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/TargetAndFormAcceptor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserRegistrationNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/main/resources/mybatis/Task.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    M model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    M model/workflow-impl/testng-integration.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java

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


  Commit: 8708f4a2238ea2794abb9241a300777a305ced8c
      https://github.com/Evolveum/midpoint/commit/8708f4a2238ea2794abb9241a300777a305ced8c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdapDumber.java
    A testing/conntest/src/test/resources/openldap-dumber/resource.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync.xml
    M testing/conntest/testng-integration.xml

  Log Message:
  -----------
  Dumber OpenLDAP test - attempt to reproduce MID-3713 (not successful)


  Commit: a8b3ee16fe625ea78f0f596d4d76f33318e0e063
      https://github.com/Evolveum/midpoint/commit/a8b3ee16fe625ea78f0f596d4d76f33318e0e063
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    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/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java

  Log Message:
  -----------
  Finish operations only - preliminary.


  Commit: ff002c2017fae3598472db103ec4b44582802844
      https://github.com/Evolveum/midpoint/commit/ff002c2017fae3598472db103ec4b44582802844
  Author: jan.melnik <jan.melnik at ami.cz>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml

  Log Message:
  -----------
  minor typo fix


  Commit: 8fbc49ea2ff8c6f5e6d0a0e91a9c15b5bfece340
      https://github.com/Evolveum/midpoint/commit/8fbc49ea2ff8c6f5e6d0a0e91a9c15b5bfece340
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  Fixed MID-3724: Shadow details page: QueryException (type mistmatch?)


  Commit: 50565a86377047e42f02e6fa34cb624ccde41584
      https://github.com/Evolveum/midpoint/commit/50565a86377047e42f02e6fa34cb624ccde41584
  Author: mederly <pavol.mederly at gmail.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml

  Log Message:
  -----------
  Merge pull request #22 from littleBigMen/master

minor typo fix


  Commit: fc5c90901d670604d5fe5e876752fb4fbbc63db8
      https://github.com/Evolveum/midpoint/commit/fc5c90901d670604d5fe5e876752fb4fbbc63db8
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties

  Log Message:
  -----------
  Translation update, WIP


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

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M model/workflow-impl/src/test/resources/policy/041-role-approver.xml

  Log Message:
  -----------
  Fixed other instances of role "approver".

(cherry picked from commit 9253cc8)


  Commit: 97359965ed2fee399dcbf48fe8bdd7f1fce9a483
      https://github.com/Evolveum/midpoint/commit/97359965ed2fee399dcbf48fe8bdd7f1fce9a483
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties

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


  Commit: 883fd8efbff3b05717ef70b79229313160f7d684
      https://github.com/Evolveum/midpoint/commit/883fd8efbff3b05717ef70b79229313160f7d684
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M model/workflow-impl/testng-integration.xml

  Log Message:
  -----------
  Disabled failing test.


  Commit: 29a61dda9257efbb4b4b94c54f7ef21a8a23805c
      https://github.com/Evolveum/midpoint/commit/29a61dda9257efbb4b4b94c54f7ef21a8a23805c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java

  Log Message:
  -----------
  adding panel with statisctics for resource details content panel


  Commit: 936faa4b0f01a385b38dab4ec8d0fc237df75fbf
      https://github.com/Evolveum/midpoint/commit/936faa4b0f01a385b38dab4ec8d0fc237df75fbf
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-05 (Sun, 05 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Role catalog: user's assignments view, not finished yet


  Commit: 5c620dba1308286c69e99cd0329784b17b8ca508
      https://github.com/Evolveum/midpoint/commit/5c620dba1308286c69e99cd0329784b17b8ca508
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-05 (Sun, 05 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    M model/workflow-impl/testng-integration.xml
    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
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdapDumber.java
    A testing/conntest/src/test/resources/openldap-dumber/resource.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync.xml
    M testing/conntest/testng-integration.xml

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


  Commit: d2b752306f3648da6b544165f0830beb91af2e2a
      https://github.com/Evolveum/midpoint/commit/d2b752306f3648da6b544165f0830beb91af2e2a
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

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

  Log Message:
  -----------
  Added Polish language. Czekamy na język polski!


  Commit: 66b384b66a942032173807c11ff35990d282e19f
      https://github.com/Evolveum/midpoint/commit/66b384b66a942032173807c11ff35990d282e19f
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties

  Log Message:
  -----------
  New localication in progress: Polish!
Thanks go to contributor wstaszewski on transifex
Also OlgaMirsanova (ru), PetrGasparik (cz, en).


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

  Changed paths:
    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/component/assignment/AssignmentCatalogPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/testng-integration.xml
    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
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdapDumber.java
    A testing/conntest/src/test/resources/openldap-dumber/resource.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/openldap-dumber/task-sync.xml
    M testing/conntest/testng-integration.xml

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.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/lens/AssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/DumpVariables.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
    M testing/story/pom.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/ctx-story-test-main.xml
    M testing/story/src/test/resources/logback-test.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-1.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
    R testing/story/src/test/resources/strings/roles-2/a-test-4.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    A testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Misc wf enhancements/fixes. First (incomplete) approval story test.

Approval schema fragments applicable to multiple levels at once.
Fixed work item completion: form properties now in local scope.
Better variable dumps.
Cleaning up obsolete triggers.


Compare: https://github.com/Evolveum/midpoint/compare/99cf274dd802...0b7fa1bee8c6


More information about the midPoint-svn mailing list