[midPoint-git] [Evolveum/midpoint] 13314d: Merging progress-reporting functionality into mast...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 13314d186555b04c95cec6354e5b2e18c8e30315
      https://github.com/Evolveum/midpoint/commit/13314d186555b04c95cec6354e5b2e18c8e30315
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportActivityDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportingAwarePage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.html
    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.html
    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/admin/users/PageUser.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressListener.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelProjectionContext.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/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java

  Log Message:
  -----------
  Merging progress-reporting functionality into master branch.


  Commit: b5c7b21ad0e4a782802ad07bb352ab493287ada8
      https://github.com/Evolveum/midpoint/commit/b5c7b21ad0e4a782802ad07bb352ab493287ada8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    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/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java

  Log Message:
  -----------
  Added progress reporting to PageRole + some minor fixes.


  Commit: e7f63d9be3044ecc552b3d4474b71079c4389c15
      https://github.com/Evolveum/midpoint/commit/e7f63d9be3044ecc552b3d4474b71079c4389c15
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    A gui/admin-gui-es-ES/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java

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


Compare: https://github.com/Evolveum/midpoint/compare/e6cc9f37fe5e...e7f63d9be304