[midPoint-git] [Evolveum/midpoint] 42478f: MID-2785 fixed

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 42478f306a395ed14e925bafd9587245c1dd6380
      https://github.com/Evolveum/midpoint/commit/42478f306a395ed14e925bafd9587245c1dd6380
  Author: honchar <honchar at evolveum.com>
  Date:   2016-03-14 (Mon, 14 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfProfile.java
    A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageLoginTest.java
    M gui/admin-gui/src/test/resources/ctx-admin-gui-test-main.xml
    M samples/resources/csvfile/midpoint-flatfile.csv

  Log Message:
  -----------
  MID-2785 fixed


  Commit: 8ad2ef5921e5d7acb77809e64731b22eea673b68
      https://github.com/Evolveum/midpoint/commit/8ad2ef5921e5d7acb77809e64731b22eea673b68
  Author: honchar <honchar at evolveum.com>
  Date:   2016-03-14 (Mon, 14 Mar 2016)

  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/web/component/breadcrumbs/BreadcrumbPageClass.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.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/error/PageError.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    A icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyOrg.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.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/SynchronizationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    A model/model-impl/src/test/resources/refinedschema/task-reconcile-dummy-kind-intent-objectclass.xml
    A model/model-impl/src/test/resources/refinedschema/task-reconcile-dummy-kind-intent.xml
    A model/model-impl/src/test/resources/refinedschema/task-reconcile-dummy-objectclass.xml
    M model/model-impl/testng-unit.xml
    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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
    A model/model-intest/src/test/resources/sync/role-corpse.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.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/consistency/impl/GenericErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M samples/stories/multitenant-idm-saas/lookupTables/lookup-employee-type.xml
    M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
    M samples/stories/multitenant-idm-saas/objectTemplates/object-template-user.xml
    M samples/stories/multitenant-idm-saas/org/org-top.xml
    M samples/stories/multitenant-idm-saas/resources/crm-simulation-sync.xml
    M samples/stories/multitenant-idm-saas/resources/openldap-customers.xml
    M samples/stories/multitenant-idm-saas/roles/metarole-org.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-admin.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-enduser.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-basic-admin.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-basic-poweruser.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-basic-user.xml
    M samples/stories/multitenant-idm-saas/roles/role-meta-ldap-customer-group.xml
    M samples/stories/multitenant-idm-saas/valuePolicies/normal-password-policy.xml
    M samples/stories/multitenant-idm-saas/valuePolicies/stronger-password-policy.xml
    M samples/stories/multitenant-idm-saas/valuePolicies/verystrong-password-policy.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/67bb54ed9209...8ad2ef5921e5