[midPoint-git] [Evolveum/midpoint] 17ca6c: fixing samples

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 17ca6c3c7ec3cabecd5a4566487882d4806a7850
      https://github.com/Evolveum/midpoint/commit/17ca6c3c7ec3cabecd5a4566487882d4806a7850
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    A samples/demo-generic synchronization/objectTemplate-SystemConfiguration-after-logging-GenSync.txt
    R samples/demo-generic synchronization/objectTemplate-SystemConfiguration-after-logging-GenSync.xml
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo/org.xml

  Log Message:
  -----------
  fixing samples


  Commit: 4d5c589d11c627e811dff3ddec27327ceadb4f0f
      https://github.com/Evolveum/midpoint/commit/4d5c589d11c627e811dff3ddec27327ceadb4f0f
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionTypeDto.java
    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/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SynchronizationActionTypeDto.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
    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
    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/PageUsers.java
    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 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.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:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/68df5946340b...4d5c589d11c6