[midPoint-git] [Evolveum/midpoint] be1edb: fixing displayName for url (ServiceType)

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: be1edb12ddbdb60ff61d28531b728215e5b7fff1
      https://github.com/Evolveum/midpoint/commit/be1edb12ddbdb60ff61d28531b728215e5b7fff1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  fixing displayName for url (ServiceType)


  Commit: 749d5d933bf90a902f251e8a906345f90be7ccaa
      https://github.com/Evolveum/midpoint/commit/749d5d933bf90a902f251e8a906345f90be7ccaa
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  objectPolicy configruation pannel - support for ServiceType


  Commit: 471eb73f543ad6dc77b166e66511c93081fa723c
      https://github.com/Evolveum/midpoint/commit/471eb73f543ad6dc77b166e66511c93081fa723c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/resources/common/account-shadow-calypso-dummy.xml

  Log Message:
  -----------
  fixing synchronziation tests - model-impl


  Commit: dff90e765657deecc55a2ee2b562702398f06d67
      https://github.com/Evolveum/midpoint/commit/dff90e765657deecc55a2ee2b562702398f06d67
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  fixing object policy dialog - support for service type.. rework to the mainpopup instead of new dialog.


  Commit: 62250a26bcdff68196fa1bd7cf579d83903659f6
      https://github.com/Evolveum/midpoint/commit/62250a26bcdff68196fa1bd7cf579d83903659f6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M build-system/pom.xml
    M dist/midpoint-api/pom.xml
    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/dialog/DeleteAllPanel.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/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestReconScript.java
    M model/model-impl/src/test/resources/common/user-elaine.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/resources/logback-test.xml
    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/TestOpenLdap.java

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


  Commit: e4667584b29d9f2a92f074b8d14bec4ec0cecb99
      https://github.com/Evolveum/midpoint/commit/e4667584b29d9f2a92f074b8d14bec4ec0cecb99
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

  Log Message:
  -----------
  fixing story tests..


  Commit: ac407bac77ed80c097f6d7a5dbfa28517edaa1f7
      https://github.com/Evolveum/midpoint/commit/ac407bac77ed80c097f6d7a5dbfa28517edaa1f7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

  Log Message:
  -----------
  reverting some changes in OrgSync test..


  Commit: 3f076a7e138d43faaefc929322a41c39cbb61a6e
      https://github.com/Evolveum/midpoint/commit/3f076a7e138d43faaefc929322a41c39cbb61a6e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/role-sailor.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/e520ea0b6658...3f076a7e138d