[midPoint-git] [Evolveum/midpoint] 8d0273: RW: show warning when there are duplicate type def...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8d0273a7d87eb54f0699365532350ebc4541fcaa
      https://github.com/Evolveum/midpoint/commit/8d0273a7d87eb54f0699365532350ebc4541fcaa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceObjectTypeDefinitionTypeDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java

  Log Message:
  -----------
  RW: show warning when there are duplicate type definitions in schemaHandling or synchronization


  Commit: 67abe49b76fecb054f9150ae1271b1d351251f6c
      https://github.com/Evolveum/midpoint/commit/67abe49b76fecb054f9150ae1271b1d351251f6c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
    M infra/schema/src/main/resources/localization/schema.properties
    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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M samples/org/org-monkey-island-simple.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/b56f4f88655b...67abe49b76fe