[midPoint-git] [Evolveum/midpoint] c634f1: Some fixes related to task state reporting/storing...

Viliam Repan vilo.repan at evolveum.com
Thu Oct 1 09:14:18 CEST 2015


  Branch: refs/heads/feature/menu
  Home:   https://github.com/Evolveum/midpoint
  Commit: c634f1c2539180724572a5b4d7609bba7ea83002
      https://github.com/Evolveum/midpoint/commit/c634f1c2539180724572a5b4d7609bba7ea83002
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    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/TaskHandlerUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

  Log Message:
  -----------
  Some fixes related to task state reporting/storing.


  Commit: 0b5ab5269c0577f3e6ace3661620ec8900a1eecd
      https://github.com/Evolveum/midpoint/commit/0b5ab5269c0577f3e6ace3661620ec8900a1eecd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  DB scripts, preliminary version.


  Commit: 5fd41bf2718f05900cd50f8a8224b0d86ab6cb4b
      https://github.com/Evolveum/midpoint/commit/5fd41bf2718f05900cd50f8a8224b0d86ab6cb4b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    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/security/MidPointApplication.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SelectorOptionsTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgPhotoTest.java
    A repo/repo-sql-impl-test/src/test/resources/photo/org.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t101-add-org-type.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t102-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t103-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t104-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t105-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t106-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t107-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t108-remove-other-photo-by-delete.xml
    M repo/repo-sql-impl-test/src/test/resources/photo/user.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUserPhoto.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RFocusPhotoId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RUserPhotoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityStateInterceptor.java

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: ce4007b46f8e2885d3be26063cd400aee0cc4730
      https://github.com/Evolveum/midpoint/commit/ce4007b46f8e2885d3be26063cd400aee0cc4730
  Author: Martin Lizner <martin.lizner at ami.cz>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java

  Log Message:
  -----------
  MID-2544 and user report enhancements preview


  Commit: eadd85921e2e40620d0758e439f6960da0b4524d
      https://github.com/Evolveum/midpoint/commit/eadd85921e2e40620d0758e439f6960da0b4524d
  Author: Martin Lizner <martin.lizner at ami.cz>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml

  Log Message:
  -----------
  debug print removal


  Commit: 3f61308ef8564a8e6fdfd2e0d5eeac153108a34f
      https://github.com/Evolveum/midpoint/commit/3f61308ef8564a8e6fdfd2e0d5eeac153108a34f
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  fixing response page after new user creation..


  Commit: ed5dcc6e6c017d224c6b9b3d268529ae5da66309
      https://github.com/Evolveum/midpoint/commit/ed5dcc6e6c017d224c6b9b3d268529ae5da66309
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/Utf8BundleStringResourceLoader.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluatorFactory.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/resources/unix/role-meta-unix-group.xml
    M testing/story/src/test/resources/unix/role-unix.xml
    A testing/story/src/test/resources/unix/sequence-gidnumber.xml

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


  Commit: ac3ab49908d6db384ed55907ed028cbdb76da6d1
      https://github.com/Evolveum/midpoint/commit/ac3ab49908d6db384ed55907ed028cbdb76da6d1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  Photo-related upgrade script for PostgreSQL.


  Commit: d08b6a5e92f19710158282d213a40652d4a82c27
      https://github.com/Evolveum/midpoint/commit/d08b6a5e92f19710158282d213a40652d4a82c27
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    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/component/util/SimplePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseAbstractRolePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    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/roles/RoleMemberPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RolePolicyPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RolePolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserListItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleMembersStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/Utf8BundleStringResourceLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.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-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluatorFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M samples/rest/modification-assign-account.xml
    M samples/rest/notify-change-new-account.xml
    M samples/rest/query-all-accounts.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/resources/logback-test.xml
    M testing/story/src/test/resources/unix/role-meta-unix-group.xml
    M testing/story/src/test/resources/unix/role-unix.xml
    A testing/story/src/test/resources/unix/sequence-gidnumber.xml
    A testing/story/src/test/resources/unix/sequence-uidnumber.xml

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


  Commit: d1caa98662c4e3190d7d46e529c6f8fd1483b17a
      https://github.com/Evolveum/midpoint/commit/d1caa98662c4e3190d7d46e529c6f8fd1483b17a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  Photo-related upgrade script for MS SQL Server.


  Commit: 474fb148c7539aa70ed86c087e986dae153364af
      https://github.com/Evolveum/midpoint/commit/474fb148c7539aa70ed86c087e986dae153364af
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  Photo-related upgrade script for MySQL.


  Commit: 23845df26b04f4250be3cb762a90ca605b2b0fa8
      https://github.com/Evolveum/midpoint/commit/23845df26b04f4250be3cb762a90ca605b2b0fa8
  Author: Martin Lizner <martin.lizner at ami.cz>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  sqlserver upgrade script fix (missing exec)


  Commit: 83603f8197aa47dd44be65a0781b137a4a158d38
      https://github.com/Evolveum/midpoint/commit/83603f8197aa47dd44be65a0781b137a4a158d38
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties

  Log Message:
  -----------
  Translation pulled from transifex and converted. Czech translation almost complete thanks to Roman Pudil and Petr Gasparik from AMI Praha.


  Commit: 71ed57fd18de0110e3cbc62a30b86794382b1ef5
      https://github.com/Evolveum/midpoint/commit/71ed57fd18de0110e3cbc62a30b86794382b1ef5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  Updating transifex client config to unicode properties


  Commit: 1b6af0c5592e8461f239355a0a71b4d0f78a65bb
      https://github.com/Evolveum/midpoint/commit/1b6af0c5592e8461f239355a0a71b4d0f78a65bb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  Transifex-processed files (comitting to avoid phantom changes later)


  Commit: 386101740cdcce8c4bb2efd30f5620ddffb05533
      https://github.com/Evolveum/midpoint/commit/386101740cdcce8c4bb2efd30f5620ddffb05533
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql

  Log Message:
  -----------
  Photo-related upgrade script for Oracle & H2.


  Commit: 4f7787d4f57e58f12210c12c729ab766aecd5bc1
      https://github.com/Evolveum/midpoint/commit/4f7787d4f57e58f12210c12c729ab766aecd5bc1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M .tx/config
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

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


  Commit: 2266d0e7f04ca599317dc2cff95b809be31f0f76
      https://github.com/Evolveum/midpoint/commit/2266d0e7f04ca599317dc2cff95b809be31f0f76
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java

  Log Message:
  -----------
  support for photo - role, org.


  Commit: 6b6fb6d33f34b2ea64b2e29cc2ca54afa95c6192
      https://github.com/Evolveum/midpoint/commit/6b6fb6d33f34b2ea64b2e29cc2ca54afa95c6192
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ParamsTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteDataSource.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebServiceRaw.java

  Log Message:
  -----------
  small fixes for jaspersoft studio integration (reference target name serialization, etc..), small cleanup in report ws


  Commit: 5788eeb8312a2ff52a9ec262094c00055bfec838
      https://github.com/Evolveum/midpoint/commit/5788eeb8312a2ff52a9ec262094c00055bfec838
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M .tx/config
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    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/TaskHandlerUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

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


  Commit: 7878570de6fd5e4ec93ebe9c13223c2a0a87e455
      https://github.com/Evolveum/midpoint/commit/7878570de6fd5e4ec93ebe9c13223c2a0a87e455
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Cleaning up the test, adding recompute checks


  Commit: 57d557a307d05f804e196c0521c978dd8f0fa4c3
      https://github.com/Evolveum/midpoint/commit/57d557a307d05f804e196c0521c978dd8f0fa4c3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Reclaiming unused sequence values on clockwork failure (+tests)


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java

  Log Message:
  -----------
  preparing lookups for autocomplete in runreport popup panel


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

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


  Commit: 9ef5060dac3b01bb56afba2e47db93adc0ea3e16
      https://github.com/Evolveum/midpoint/commit/9ef5060dac3b01bb56afba2e47db93adc0ea3e16
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.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/configuration/component/ChooseTypeDialog.java
    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/users/PageOrgUnit.html
    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/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java

  Log Message:
  -----------
  fixig NPE (MID-2595)


  Commit: 8430d4f2c6d6ac1147653799745db0c0f61a8dd6
      https://github.com/Evolveum/midpoint/commit/8430d4f2c6d6ac1147653799745db0c0f61a8dd6
  Author: Martin Lizner <martin.lizner at ami.cz>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Reporting GUI - support for parameter properties demo


  Commit: 04ed18244bbd303206f1e4cb8874dcd09e269c65
      https://github.com/Evolveum/midpoint/commit/04ed18244bbd303206f1e4cb8874dcd09e269c65
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  removing show all assignments button -> added to assignment menu


  Commit: 3d66774fa27df5d4a008210e53d9523d1615936b
      https://github.com/Evolveum/midpoint/commit/3d66774fa27df5d4a008210e53d9523d1615936b
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java

  Log Message:
  -----------
  fixing MID-2595


  Commit: a9b7a28aa3e94418be4abcab3d2b45ae2cc21415
      https://github.com/Evolveum/midpoint/commit/a9b7a28aa3e94418be4abcab3d2b45ae2cc21415
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointLocalQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java

  Log Message:
  -----------
  fixing reports..


  Commit: 565d308630e0fbff83dbc9a02f348b3647b54b63
      https://github.com/Evolveum/midpoint/commit/565d308630e0fbff83dbc9a02f348b3647b54b63
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M .tx/config
    M config/initial-objects/110-report-user-list.xml
    M config/sql/_all/h2-upgrade-3.2-3.3.sql
    M config/sql/_all/mysql-upgrade-3.2-3.3.sql
    M config/sql/_all/oracle-upgrade-3.2-3.3.sql
    M config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    M config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.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/configuration/component/ChooseTypeDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java
    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/RoleMemberPanel.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/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/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ParamsTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    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/TaskHandlerUtil.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointLocalQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteDataSource.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebServiceRaw.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/menu

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint.properties


Compare: https://github.com/Evolveum/midpoint/compare/88cfe09a167f...565d308630e0


More information about the midPoint-svn mailing list