[midPoint-git] [Evolveum/midpoint] 6059b2: Fixing conntests (AD and OpenLDAP)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6059b2cd285872ef10cb1ce2f84a946037df3964
      https://github.com/Evolveum/midpoint/commit/6059b2cd285872ef10cb1ce2f84a946037df3964
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java

  Log Message:
  -----------
  Fixing conntests (AD and OpenLDAP)


  Commit: fcb37636bc6daf84408b81e8a7ce56b22e8c463b
      https://github.com/Evolveum/midpoint/commit/fcb37636bc6daf84408b81e8a7ce56b22e8c463b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/MappingsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/NotificationsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDtoModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskStatePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskStatePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/OperationalInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    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/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/7f30f46df621...fcb37636bc6d