[midPoint-git] [Evolveum/midpoint] b90ca9: Temporary fix for MID-1955 (problems with bulk act...

[Viliam Repan]

  Branch: refs/heads/gui-devel
  Home:   https://github.com/Evolveum/midpoint
  Commit: b90ca91bdf121276d5699bfe20c4f3bb0025afe3
      https://github.com/Evolveum/midpoint/commit/b90ca91bdf121276d5699bfe20c4f3bb0025afe3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanInspector.java
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    A infra/schema/src/test/resources/common/task-bulk-action-1.xml
    M infra/schema/testng.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
    M model/model-intest/src/test/resources/scripting/assign-to-jack.xml
    M model/model-intest/src/test/resources/scripting/delete-and-add-jack.xml
    M model/model-intest/src/test/resources/scripting/log.xml
    M model/model-intest/src/test/resources/scripting/modify-jack-back.xml
    M model/model-intest/src/test/resources/scripting/modify-jack.xml
    M model/model-intest/src/test/resources/scripting/search-for-shadows-nofetch.xml
    M model/model-intest/src/test/resources/scripting/search-for-users-accounts-nofetch.xml
    M model/model-intest/src/test/resources/scripting/search-for-users-accounts.xml
    M samples/model-client-sample/src/main/bin/discover-rebind.xml
    M samples/tasks/bulk-actions/assign-enduser-role-to-selected-users.xml
    M samples/tasks/bulk-actions/assign-resource-to-selected-users.xml
    M samples/tasks/bulk-actions/discover-rebind.xml
    M samples/tasks/bulk-actions/modify-selected-users.xml

  Log Message:
  -----------
  Temporary fix for MID-1955 (problems with bulk actions parsing).


  Commit: a5181ec6659bef00cef8556ebd47fb4af257cdee
      https://github.com/Evolveum/midpoint/commit/a5181ec6659bef00cef8556ebd47fb4af257cdee
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/util/WebMiscUtil.java

  Log Message:
  -----------
  MID-1979 fix - accountStatus is now shown as dropDownChoice instead of text field.


  Commit: 6e351ed88e994a65aea7a5f497f8ed42c67328f6
      https://github.com/Evolveum/midpoint/commit/6e351ed88e994a65aea7a5f497f8ed42c67328f6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java

  Log Message:
  -----------
  Fixed MID-1847 (serialization of SearchFilterType incorrect w.r.t. schema)


  Commit: d37082de4f8cfc44565623d34caf3d3cbc3d5c4c
      https://github.com/Evolveum/midpoint/commit/d37082de4f8cfc44565623d34caf3d3cbc3d5c4c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java

  Log Message:
  -----------
  Just a few typos and details.


  Commit: 80f22d1cd24a16583af0bce5f21f70e99f1824d6
      https://github.com/Evolveum/midpoint/commit/80f22d1cd24a16583af0bce5f21f70e99f1824d6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/resources/diff/resource-after-ns-change.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/schema/src/test/resources/diff/resource-before.xml

  Log Message:
  -----------
  Fixing MID-1969, point #2.


  Commit: b9b6b4ab2299d0580eb0c4b3c4c388389ef8b411
      https://github.com/Evolveum/midpoint/commit/b9b6b4ab2299d0580eb0c4b3c4c388389ef8b411
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/util/WebMiscUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    A infra/schema/src/test/resources/common/task-bulk-action-1.xml
    M infra/schema/src/test/resources/diff/resource-after-ns-change.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/schema/src/test/resources/diff/resource-before.xml
    M infra/schema/testng.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
    M model/model-intest/src/test/resources/scripting/assign-to-jack.xml
    M model/model-intest/src/test/resources/scripting/delete-and-add-jack.xml
    M model/model-intest/src/test/resources/scripting/log.xml
    M model/model-intest/src/test/resources/scripting/modify-jack-back.xml
    M model/model-intest/src/test/resources/scripting/modify-jack.xml
    M model/model-intest/src/test/resources/scripting/search-for-shadows-nofetch.xml
    M model/model-intest/src/test/resources/scripting/search-for-users-accounts-nofetch.xml
    M model/model-intest/src/test/resources/scripting/search-for-users-accounts.xml
    M samples/model-client-sample/src/main/bin/discover-rebind.xml
    M samples/tasks/bulk-actions/assign-enduser-role-to-selected-users.xml
    M samples/tasks/bulk-actions/assign-resource-to-selected-users.xml
    M samples/tasks/bulk-actions/discover-rebind.xml
    M samples/tasks/bulk-actions/modify-selected-users.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/9b55d905b037...b9b6b4ab2299