[midPoint-git] [Evolveum/midpoint] 2b4575: report data source impelentation. small refactor f...

Radovan Semancik radovan.semancik at evolveum.com
Fri Feb 27 18:40:45 CET 2015


  Branch: refs/heads/ldap
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2b45757de9f5f201bf8ef06a934963d48aec13f0
      https://github.com/Evolveum/midpoint/commit/2b45757de9f5f201bf8ef06a934963d48aec13f0
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/catalog-runtime.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    A infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/report/reportWrapper.wsdl
    A infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M model/model-client/pom.xml
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/pom.xml
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    A model/report-ds-impl/pom.xml
    A model/report-ds-impl/src/compile/resources/catalog.xml
    A model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    A model/report-ds-impl/src/main/assembly/bin.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/ClientPasswordHandler.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    M model/report-impl/pom.xml
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ClientPasswordHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointAbstractDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/ctx-report.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-runtime.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml

  Log Message:
  -----------
  report data source impelentation. small refactor for report task handler..


  Commit: bd7ee059a32fc61279f2b1a0b09451729883666a
      https://github.com/Evolveum/midpoint/commit/bd7ee059a32fc61279f2b1a0b09451729883666a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Fix for saving extension attributes in role editor.


  Commit: 05f80ea1cd243397abca4e11c08f25e57f42b0c7
      https://github.com/Evolveum/midpoint/commit/05f80ea1cd243397abca4e11c08f25e57f42b0c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java

  Log Message:
  -----------
  Fixing MID-2222


  Commit: dcea66c7db4f8c06626bcaad9ef3281eafc778f2
      https://github.com/Evolveum/midpoint/commit/dcea66c7db4f8c06626bcaad9ef3281eafc778f2
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    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/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java

  Log Message:
  -----------
  TreeTablePanel rework - adding separate tables for child org. units, managers and members of org.


  Commit: 631b0db2ca5d9cca02a17b0298c799a119fbb67c
      https://github.com/Evolveum/midpoint/commit/631b0db2ca5d9cca02a17b0298c799a119fbb67c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java

  Log Message:
  -----------
  Added getManagers() tests


  Commit: c1a1542b282f818afa00e34f080c9f15d1ec2bc6
      https://github.com/Evolveum/midpoint/commit/c1a1542b282f818afa00e34f080c9f15d1ec2bc6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

  Log Message:
  -----------
  Reworked from orgFilter to refFilter


  Commit: fc57cf39f228279a1220818063bb8e4546ad6c77
      https://github.com/Evolveum/midpoint/commit/fc57cf39f228279a1220818063bb8e4546ad6c77
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java

  Log Message:
  -----------
  More tests for getManagersOfOrg, small optimization


  Commit: 566b670e8eb48aaf9bb3156d1fdbe8744dcb14cd
      https://github.com/Evolveum/midpoint/commit/566b670e8eb48aaf9bb3156d1fdbe8744dcb14cd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M testing/story/src/test/resources/common/user-administrator.xml
    M testing/story/src/test/resources/trafo/role-employee.xml

  Log Message:
  -----------
  Fixing trafo story


  Commit: 97ad913903426ca0bca22f2c41b30d04a684536e
      https://github.com/Evolveum/midpoint/commit/97ad913903426ca0bca22f2c41b30d04a684536e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    R repo/repo-sql-impl-test/STATS
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.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/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RIncludeRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RParentOrgRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RResourceApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RRoleApproverRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  fix for reference storing, metadata with the same createApproverRef and modifyApproverRef couldn't be stored.


  Commit: f000c9900ff67c233d79372f6ef3a666d77a7617
      https://github.com/Evolveum/midpoint/commit/f000c9900ff67c233d79372f6ef3a666d77a7617
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  General edit schema mostly complete.


  Commit: 38630b4ee3ac4f12028e4a382e305789bda69e27
      https://github.com/Evolveum/midpoint/commit/38630b4ee3ac4f12028e4a382e305789bda69e27
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    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/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 infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java

  Log Message:
  -----------
  "Reconcile affected objects" option implemented for roles


  Commit: 5216c3ea7babe1852d1fedfc573b03f5d3ed820d
      https://github.com/Evolveum/midpoint/commit/5216c3ea7babe1852d1fedfc573b03f5d3ed820d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java

  Log Message:
  -----------
  Prefix of "org" will be used for org-3 namespace


  Commit: 18fd7d4e50b4dffe1aa47a9fa3e8fb9230dd671a
      https://github.com/Evolveum/midpoint/commit/18fd7d4e50b4dffe1aa47a9fa3e8fb9230dd671a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    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/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 infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M testing/story/src/test/resources/common/user-administrator.xml
    M testing/story/src/test/resources/trafo/role-employee.xml

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


  Commit: 435740a90d55ccf08f85349479d66acaddde49fc
      https://github.com/Evolveum/midpoint/commit/435740a90d55ccf08f85349479d66acaddde49fc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Tests for reconcile affected objects.


  Commit: 829792648e53c687dca701a91df74296af685de7
      https://github.com/Evolveum/midpoint/commit/829792648e53c687dca701a91df74296af685de7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Repo API for lookup table (MID-2206)


  Commit: 7ee4a1bebdcd40707d1fd97fbb846d32897f9d5e
      https://github.com/Evolveum/midpoint/commit/7ee4a1bebdcd40707d1fd97fbb846d32897f9d5e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: c406771d8d3229962edb86d69228ff1091e189fb
      https://github.com/Evolveum/midpoint/commit/c406771d8d3229962edb86d69228ff1091e189fb
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less

  Log Message:
  -----------
  TreeTabel panel improvements - adding inline menus, improving queries etc.


  Commit: 214420ce194c366b332a43d8dd88546ea5df4139
      https://github.com/Evolveum/midpoint/commit/214420ce194c366b332a43d8dd88546ea5df4139
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

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


  Commit: ee61924da9670f38749e2e52350bef4d04692025
      https://github.com/Evolveum/midpoint/commit/ee61924da9670f38749e2e52350bef4d04692025
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java

  Log Message:
  -----------
  Refactoring role exclusion schema (needed for MID-2210)


  Commit: 94d62b83d2a9130d37ddd1e698fa66746a139ddb
      https://github.com/Evolveum/midpoint/commit/94d62b83d2a9130d37ddd1e698fa66746a139ddb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd

  Log Message:
  -----------
  Schema for minAssignees and maxAssignees (MID-2210)


  Commit: 09d2fb5d113584e578fefefffe3801e572452578
      https://github.com/Evolveum/midpoint/commit/09d2fb5d113584e578fefefffe3801e572452578
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

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

  Log Message:
  -----------
  Fixing policyContraints schema. Refactoring exclusion implementation to new schema.


  Commit: fa30c5c382d19f38cd2c3d0d6f416f60882406ba
      https://github.com/Evolveum/midpoint/commit/fa30c5c382d19f38cd2c3d0d6f416f60882406ba
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml

  Log Message:
  -----------
  Implementing role assignee constraints (MID-2210) +tests


  Commit: 16e2693a6193dc996de98b7ee087ba324027c533
      https://github.com/Evolveum/midpoint/commit/16e2693a6193dc996de98b7ee087ba324027c533
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    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/configuration/dto/InternalsConfigDto.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/LiteralEqualsStrategy.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.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
    A infra/schema/src/test/resources/diff/resource2-broken.xml
    A infra/schema/src/test/resources/diff/resource2-fixed.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java

  Log Message:
  -----------
  Fixed MID-2218 - temporary "prefix safe mode" to enable correcting NS prefixes via debug pages


  Commit: 26477c1c6c611ddaa88b8f2b8efbccfb2d7a2208
      https://github.com/Evolveum/midpoint/commit/26477c1c6c611ddaa88b8f2b8efbccfb2d7a2208
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/TestRbac.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java

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


  Commit: db648c472b5a3eb3c7e0addbd613eaed28ce5841
      https://github.com/Evolveum/midpoint/commit/db648c472b5a3eb3c7e0addbd613eaed28ce5841
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java

  Log Message:
  -----------
  Temporarily hacked MID-2079: ConnId framework version in "About" page


  Commit: c6ee8dc5cc4e326c146b5a31f7a4dd72df449688
      https://github.com/Evolveum/midpoint/commit/c6ee8dc5cc4e326c146b5a31f7a4dd72df449688
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java

  Log Message:
  -----------
  Removing design decoration leftover :-)


  Commit: 46bc32f34674ee3628979a0d6230b9f9a8c884c3
      https://github.com/Evolveum/midpoint/commit/46bc32f34674ee3628979a0d6230b9f9a8c884c3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/testng.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Test for explicit password fetch. Fix.


  Commit: a2112c3087c22b0db752226b8bcf57557962ce42
      https://github.com/Evolveum/midpoint/commit/a2112c3087c22b0db752226b8bcf57557962ce42
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java

  Log Message:
  -----------
  Fixing the fix?


  Commit: ea88d8430f1e650cf7fd49a2dc88e525b64c4a1a
      https://github.com/Evolveum/midpoint/commit/ea88d8430f1e650cf7fd49a2dc88e525b64c4a1a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml

  Log Message:
  -----------
  Fixing objectType/objectClass confusion (+test)


  Commit: a19c2779104b13da6b75a979a21758d4ee4f2f72
      https://github.com/Evolveum/midpoint/commit/a19c2779104b13da6b75a979a21758d4ee4f2f72
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

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

  Log Message:
  -----------
  Empty tables on TreeTablePanel are now not visible.


  Commit: 029ec965b9cd62ef8b31e1a11db4c73c8517f5c5
      https://github.com/Evolveum/midpoint/commit/029ec965b9cd62ef8b31e1a11db4c73c8517f5c5
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/testng.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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


  Commit: 45ef5473d0cc1c1d8a0c59dcea4c4ae325864adb
      https://github.com/Evolveum/midpoint/commit/45ef5473d0cc1c1d8a0c59dcea4c4ae325864adb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java

  Log Message:
  -----------
  Implementing #any for relation in reference. (MID-2225)


  Commit: 7eeb57c9ce356b8b3dc8051cd58969e213a6b1ae
      https://github.com/Evolveum/midpoint/commit/7eeb57c9ce356b8b3dc8051cd58969e213a6b1ae
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java

  Log Message:
  -----------
  Stronger error handling


  Commit: 7737d92c751fbc148cac4c92b3cdc5ad65db1886
      https://github.com/Evolveum/midpoint/commit/7737d92c751fbc148cac4c92b3cdc5ad65db1886
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M samples/demo/hr.xml
    M samples/demo/user-template.xml

  Log Message:
  -----------
  Fixes after upgrade demo to 3.1


  Commit: 7b51b06f582531b0e194482e4ce1e68fa3b935c0
      https://github.com/Evolveum/midpoint/commit/7b51b06f582531b0e194482e4ce1e68fa3b935c0
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml

  Log Message:
  -----------
  Reworked ldapGroups attribute to proper associations. Replaced assignment with inducement


  Commit: 23fb995df4665acaf4ad28dbc82d60d4622e6b6c
      https://github.com/Evolveum/midpoint/commit/23fb995df4665acaf4ad28dbc82d60d4622e6b6c
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java

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


  Commit: 69348fc7abb7f1855c91a8e4e02a5c9c2f7315b8
      https://github.com/Evolveum/midpoint/commit/69348fc7abb7f1855c91a8e4e02a5c9c2f7315b8
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M samples/demo/hr.xml

  Log Message:
  -----------
  Fixed sample to fix build


  Commit: 2b0f940653e9ddb096d58b0cf9bfd04c320a14ca
      https://github.com/Evolveum/midpoint/commit/2b0f940653e9ddb096d58b0cf9bfd04c320a14ca
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M samples/demo/opendj.xml
    M samples/demo/org.xml

  Log Message:
  -----------
  Fixed sample to fix build


  Commit: 81dca716ed647f1476d0a5599ce34f2daf1efd35
      https://github.com/Evolveum/midpoint/commit/81dca716ed647f1476d0a5599ce34f2daf1efd35
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  Fixed MID-1700-related problems. New "assigned" and "actor" (MID-2011) variables. Enable/disableTimestamp and disableReason are updated only when the state really changes.


  Commit: 8a8baa7399324353e75a66aa9c9cb75ffcc5e307
      https://github.com/Evolveum/midpoint/commit/8a8baa7399324353e75a66aa9c9cb75ffcc5e307
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml
    M samples/demo/user-template.xml

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


  Commit: fcb2a325635e4d33c5dcc5ddfc9964d3014450fe
      https://github.com/Evolveum/midpoint/commit/fcb2a325635e4d33c5dcc5ddfc9964d3014450fe
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M samples/demo/opendj.xml

  Log Message:
  -----------
  Yet another sample fix to make build work


  Commit: 68a75035973acb20f7cb1f851c65de24f3793335
      https://github.com/Evolveum/midpoint/commit/68a75035973acb20f7cb1f851c65de24f3793335
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml

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


  Commit: e47921b5822ae322e6829d0dc4d720091cb85c85
      https://github.com/Evolveum/midpoint/commit/e47921b5822ae322e6829d0dc4d720091cb85c85
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties

  Log Message:
  -----------
  MID-2131 implementation.


  Commit: 85dc3a8f3320ac97caaa6f64a84c53c269096c7a
      https://github.com/Evolveum/midpoint/commit/85dc3a8f3320ac97caaa6f64a84c53c269096c7a
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M samples/demo/opendj.xml

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


  Commit: 4e7051c3c4e5fd66f8c991e442672d38197fa1b8
      https://github.com/Evolveum/midpoint/commit/4e7051c3c4e5fd66f8c991e442672d38197fa1b8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  updated main and upgrade sql scripts for h2, mysql, postgresql


  Commit: 2bc1a4d8dfd95928ce92b1c045babfcd02ce130b
      https://github.com/Evolveum/midpoint/commit/2bc1a4d8dfd95928ce92b1c045babfcd02ce130b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  updated main and upgrade sql scripts for sql server.


  Commit: f4f38dde49df7a2cd1cc433664979ecda0881d1b
      https://github.com/Evolveum/midpoint/commit/f4f38dde49df7a2cd1cc433664979ecda0881d1b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  updated main and upgrade sql scripts for oracle.


  Commit: 9e3b2bf533be286aec35fd105cac73c4d0341525
      https://github.com/Evolveum/midpoint/commit/9e3b2bf533be286aec35fd105cac73c4d0341525
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties
    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/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    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/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/LiteralEqualsStrategy.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    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
    A infra/schema/src/test/resources/diff/resource2-broken.xml
    A infra/schema/src/test/resources/diff/resource2-fixed.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/controller/ModelDiagController.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.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/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/testng.xml
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml
    M samples/demo/user-template.xml

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


  Commit: f513ac25ccf3116cece15c2307b06cb58d3fe93e
      https://github.com/Evolveum/midpoint/commit/f513ac25ccf3116cece15c2307b06cb58d3fe93e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java

  Log Message:
  -----------
  Fixing "No authentication" test failure


  Commit: 480580bba560be41283b1544a5e5cd7f683e5686
      https://github.com/Evolveum/midpoint/commit/480580bba560be41283b1544a5e5cd7f683e5686
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  MID-2160 improvement - explicit check, if inbound mapping has a target.


  Commit: 91f819d28cd1c6ec5186c9fd0c91d4bfbfedd652
      https://github.com/Evolveum/midpoint/commit/91f819d28cd1c6ec5186c9fd0c91d4bfbfedd652
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java

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


  Commit: 61a43e298520782afccb0bffe96a010e03ef7dc6
      https://github.com/Evolveum/midpoint/commit/61a43e298520782afccb0bffe96a010e03ef7dc6
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  MID-2169 - mapping label improvement in wizard


  Commit: 8f4dbb737dc880e99ff7de28f96bc87b89f3790a
      https://github.com/Evolveum/midpoint/commit/8f4dbb737dc880e99ff7de28f96bc87b89f3790a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    A model/model-intest/src/test/resources/common/user-template-org-assignment.xml

  Log Message:
  -----------
  "Fixing" MID-2212 by disallowing changes in assignment.targetRef and assignment.construction.(kind|intent)


  Commit: 51d4e07da11123ec1503a245d5f86399375efb40
      https://github.com/Evolveum/midpoint/commit/51d4e07da11123ec1503a245d5f86399375efb40
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

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


  Commit: bd06358f1ad6edadb834a77e011468ce32567cb8
      https://github.com/Evolveum/midpoint/commit/bd06358f1ad6edadb834a77e011468ce32567cb8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

  Log Message:
  -----------
  Extended getParentOrg* library functions.


  Commit: 3b57547b1b6b067c2dd4246defb3b5b6fb49ceca
      https://github.com/Evolveum/midpoint/commit/3b57547b1b6b067c2dd4246defb3b5b6fb49ceca
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    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/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java

  Log Message:
  -----------
  Support for relation in assignmentTargetSearch


  Commit: 343127bd7dc17acefc1f32fa8951ec35d6651770
      https://github.com/Evolveum/midpoint/commit/343127bd7dc17acefc1f32fa8951ec35d6651770
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    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/AssignmentEditorPanel.properties
    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

  Log Message:
  -----------
  MID-2212 fix - relation can be set in assignment only during assignment creation, not during assignment edit.


  Commit: ed3e8ba4d48c422f1416a38dca4b24d825282604
      https://github.com/Evolveum/midpoint/commit/ed3e8ba4d48c422f1416a38dca4b24d825282604
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyConstraints.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Refactoring UCF. ResourceObjectReferenceType. Basic support for baseContext. Untested.


  Commit: f8a7335a4c8fdc2acc620dcabefdfa6c45f51687
      https://github.com/Evolveum/midpoint/commit/f8a7335a4c8fdc2acc620dcabefdfa6c45f51687
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    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 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyResourceAssignment/ResourceAssignmentModification.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyRoleAssignment/AbstractRoleAssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestConstants.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    A model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    M model/workflow-impl/testng.xml

  Log Message:
  -----------
  New approval aspects (modify role assignment, add/modify resource assignment) - GUI for them not quite finished yet.
Reenabled setting create/modifyApproverRef after fixing MID-2178.


  Commit: 47675e38e4affeae7465cc87750d8be3e469b519
      https://github.com/Evolveum/midpoint/commit/47675e38e4affeae7465cc87750d8be3e469b519
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    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/AssignmentEditorPanel.properties
    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 infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyConstraints.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

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


  Commit: 606da17e1940e36c5dc33c6fd3cd70ad2c017121
      https://github.com/Evolveum/midpoint/commit/606da17e1940e36c5dc33c6fd3cd70ad2c017121
  Author: Jan Marcek <jan.marcek at eea.sk>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  bugfix: midPoint Distribution - set correct dependency com.evolveum.midpoint.infra.prism and com.evolveum.midpoint.infra.schema to 3.2-SNAPSHOT


  Commit: 443d80e9b942d2061b7465a56f2322655077710c
      https://github.com/Evolveum/midpoint/commit/443d80e9b942d2061b7465a56f2322655077710c
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml

  Log Message:
  -----------
  report xml's clean up..


  Commit: b7f40f2f9c66626c4f1fd7780b55aa668fcff997
      https://github.com/Evolveum/midpoint/commit/b7f40f2f9c66626c4f1fd7780b55aa668fcff997
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java

  Log Message:
  -----------
  small clean up - report handler


  Commit: 93d5f4f349ce3332e127bfbb33a78f08bbfff1aa
      https://github.com/Evolveum/midpoint/commit/93d5f4f349ce3332e127bfbb33a78f08bbfff1aa
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M NEWS
    M README
    M build-system/pom.xml
    R config/sql/_all/h2-3.0-all.sql
    A config/sql/_all/h2-3.1-all.sql
    R config/sql/_all/mysql-3.0-all.sql
    A config/sql/_all/mysql-3.1-all.sql
    R config/sql/_all/oracle-3.0-all.sql
    A config/sql/_all/oracle-3.1-all.sql
    R config/sql/_all/postgresql-3.0-all.sql
    A config/sql/_all/postgresql-3.1-all.sql
    R config/sql/_all/sqlserver-3.0-all.sql
    A config/sql/_all/sqlserver-3.1-all.sql
    R config/sql/activiti/activiti.db2.create.engine.sql
    R config/sql/activiti/activiti.db2.create.history.sql
    R config/sql/activiti/activiti.db2.create.identity.sql
    R config/sql/activiti/activiti.db2.drop.engine.sql
    R config/sql/activiti/activiti.db2.drop.history.sql
    R config/sql/activiti/activiti.db2.drop.identity.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    R config/sql/activiti/activiti.h2.drop.engine.sql
    R config/sql/activiti/activiti.h2.drop.history.sql
    R config/sql/activiti/activiti.h2.drop.identity.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    R config/sql/activiti/activiti.mssql.drop.engine.sql
    R config/sql/activiti/activiti.mssql.drop.history.sql
    R config/sql/activiti/activiti.mssql.drop.identity.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    R config/sql/activiti/activiti.mysql.drop.engine.sql
    R config/sql/activiti/activiti.mysql.drop.history.sql
    R config/sql/activiti/activiti.mysql.drop.identity.sql
    A config/sql/activiti/activiti.mysql55.create.engine.sql
    A config/sql/activiti/activiti.mysql55.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    R config/sql/activiti/activiti.oracle.drop.engine.sql
    R config/sql/activiti/activiti.oracle.drop.history.sql
    R config/sql/activiti/activiti.oracle.drop.identity.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/activiti/activiti.postgres.drop.engine.sql
    R config/sql/activiti/activiti.postgres.drop.history.sql
    R config/sql/activiti/activiti.postgres.drop.identity.sql
    R config/sql/midpoint/2.2/h2/h2-2.2.sql
    R config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/mysql/mysql-2.2.sql
    R config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/oracle/oracle-2.2.sql
    R config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-2.2.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-2.2.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/3.0/h2/h2-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/h2/h2-3.0.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0.sql
    A config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    A config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_sk_SK.utf8.properties
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    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/AssignmentEditorPanel.html
    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/AssignmentEditorPanel.properties
    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/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html
    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/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.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/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.properties
    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/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceSynchronizationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    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/configuration/PageDebugView.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.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/DefaultGuiProgressListener.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/PageUsers.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/page/admin/users/component/OrgUnitBrowser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.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/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.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/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/LiteralEqualsStrategy.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.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/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyConstraints.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParsePasswordPolicy.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/lookup-table.xml
    A infra/schema/src/test/resources/common/password-policy.xml
    M infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.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
    A infra/schema/src/test/resources/diff/resource2-broken.xml
    A infra/schema/src/test/resources/diff/resource2-fixed.xml
    A infra/schema/src/test/resources/diff/shadow-before.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/test-util/pom.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
    M infra/ws-util/pom.xml
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml
    M model/model-impl/pom.xml
    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/ModelRestService.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/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.java
    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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.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/Clockwork.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/EvaluatedAssignment.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.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/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    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/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.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/sync/action/InactivateFocusAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/assignment-direct-expression.xml
    A model/model-impl/src/test/resources/lens/assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/assignment-role-manager.xml
    A model/model-impl/src/test/resources/lens/assignment-role-visitor.xml
    A model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    A model/model-impl/src/test/resources/lens/role-corp-customer.xml
    A model/model-impl/src/test/resources/lens/role-corp-employee.xml
    A model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    A model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-job-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-manager.xml
    A model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-set-cost-center.xml
    M model/model-intest/pom.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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundLiveSyncTask.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestObjTemplateLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    A model/model-intest/src/test/resources/caseignore/role-joker.xml
    A model/model-intest/src/test/resources/caseignore/role-upcase-basic.xml
    A model/model-intest/src/test/resources/common/group-shadow-dummy-upcase-joker.xml
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-fake.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy-schemaless-no-schema.xml
    M model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
    M model/model-intest/src/test/resources/common/resource-dummy-white.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/common/role-sailor.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/common/user-template.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping-inbound/resource-dummy-tea-green.xml
    A model/model-intest/src/test/resources/mapping-inbound/task-dumy-tea-green-livesync.xml
    A model/model-intest/src/test/resources/orgstruct/role-defender.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml
    A model/model-intest/src/test/resources/sync/resource-dummy-byzantine.xml
    A model/model-intest/src/test/resources/sync/role-big-judge.xml
    M model/model-intest/src/test/resources/sync/role-red-judge.xml
    A model/model-intest/src/test/resources/sync/role-red-sailor.xml
    A model/model-intest/src/test/resources/sync/system-configuration-byzantine.xml
    A model/model-intest/src/test/resources/sync/task-dummy-byzantine-livesync.xml
    A model/model-intest/src/test/resources/sync/task-dummy-byzantine-recon.xml
    A model/model-intest/src/test/resources/sync/user-template-byzantine.xml
    M model/model-intest/testng.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyResourceAssignment/ResourceAssignmentModification.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyRoleAssignment/AbstractRoleAssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestConstants.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    A model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    M model/workflow-impl/testng.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-static-schema.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    M provisioning/provisioning-impl/testng.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/pom.xml
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/sample-configurations/mysql.properties
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/util/HibernateToSqlTranslator.java
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/DataSourceTestBeanPostprocessor.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    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/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.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/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/Container.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RLookupTableRowId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RIncludeRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RParentOrgRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RResourceApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RRoleApproverRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/DefaultModifyHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/MetadataHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ModifyHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ShadowHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ShadowLinkRefHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/SyncSituationHandler.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/TaskProgressHandler.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityState.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityStateInterceptor.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/IdGeneratorResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/security-api/pom.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-impl/pom.xml
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml
    M samples/demo/user-template.xml
    M samples/model-client-sample/pom.xml
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    A samples/model-client-sample/src/main/resources/role-sea-superuser.xml
    M samples/pom.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/ad/ad-resource-simple.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
    M samples/resources/mysqluser/mysqluser-localhost-simple.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/opendj-resource-genericsync.xml
    M samples/resources/openldap/openldap-localhost-medium.xml
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml
    M samples/samples-test/pom.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/pom.xml
    A testing/longtest/src/test/resources/ldap-complex/org.xml
    M testing/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml
    M testing/story/src/test/resources/common/user-administrator.xml
    M testing/story/src/test/resources/trafo/role-employee.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
    M weblogic-build/pom.xml

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

Conflicts:
	build-system/pom.xml
	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java


  Commit: a6baa2d4baed20f0b92670615fff43d5fd6ce1b3
      https://github.com/Evolveum/midpoint/commit/a6baa2d4baed20f0b92670615fff43d5fd6ce1b3
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M model/report-ds-impl/pom.xml

  Log Message:
  -----------
  fixing version in report ds provider..


  Commit: 52cdf0abba80394578cd83834c80a2e5d423db5d
      https://github.com/Evolveum/midpoint/commit/52cdf0abba80394578cd83834c80a2e5d423db5d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java

  Log Message:
  -----------
  fixing build - imports in report tests..


  Commit: 82c99970b2755f02a519c4c8df2793772688b435
      https://github.com/Evolveum/midpoint/commit/82c99970b2755f02a519c4c8df2793772688b435
  Author: mederly <pavol.mederly at gmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Log Message:
  -----------
  Merge pull request #1 from OpenDataNode/v3.2devel-fix-version-in-module-Distribution

bugfix: midPoint Distribution - set correct dependency com.evolveum.midp...


  Commit: a792b9363b9ae7f18451224a98c1d41438b5901e
      https://github.com/Evolveum/midpoint/commit/a792b9363b9ae7f18451224a98c1d41438b5901e
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 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/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.properties

  Log Message:
  -----------
  MID-2235 fix.


  Commit: d276bc340117491a6529899754a331f79dacf6df
      https://github.com/Evolveum/midpoint/commit/d276bc340117491a6529899754a331f79dacf6df
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

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


  Commit: af8a252d1ca1ea6ce795e6608808e92a85c7505a
      https://github.com/Evolveum/midpoint/commit/af8a252d1ca1ea6ce795e6608808e92a85c7505a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Exposing evaluated assignments and roles through previewChanges (MID-1815)


  Commit: 4a70c01279d2a07048e4d3f8c9bb4fad9a19885d
      https://github.com/Evolveum/midpoint/commit/4a70c01279d2a07048e4d3f8c9bb4fad9a19885d
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java

  Log Message:
  -----------
  marking deprecated component to remove in 3.2 release.


  Commit: bf56638fc438232f16e8ae627bf8ad8aae2cdf3d
      https://github.com/Evolveum/midpoint/commit/bf56638fc438232f16e8ae627bf8ad8aae2cdf3d
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml

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


  Commit: e698ba8c842966e6b4396d50b144d449cbe78aad
      https://github.com/Evolveum/midpoint/commit/e698ba8c842966e6b4396d50b144d449cbe78aad
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M gui/admin-gui/pom.xml
    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/AssignmentEditorPanel.html
    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/AssignmentEditorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties
    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/DropDownFormGroup.properties
    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/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    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/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.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/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/page/admin/users/component/TreeTablePanel.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/page/admin/users/component/TreeTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.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/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/LiteralEqualsStrategy.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyConstraints.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/catalog-runtime.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    A infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/report/reportWrapper.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    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
    A infra/schema/src/test/resources/diff/resource2-broken.xml
    A infra/schema/src/test/resources/diff/resource2-fixed.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/expr/MidpointFunctions.java
    M model/model-client/pom.xml
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    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/lens/AssignmentEvaluator.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/Clockwork.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    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/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/pom.xml
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    A model/report-ds-impl/pom.xml
    A model/report-ds-impl/src/compile/resources/catalog.xml
    A model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    A model/report-ds-impl/src/main/assembly/bin.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/ClientPasswordHandler.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    M model/report-impl/pom.xml
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ClientPasswordHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointAbstractDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/ctx-report.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-runtime.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyResourceAssignment/ResourceAssignmentModification.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyRoleAssignment/AbstractRoleAssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestConstants.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    A model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    M model/workflow-impl/testng.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/testng.xml
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    R repo/repo-sql-impl-test/STATS
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.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/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RIncludeRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RParentOrgRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RResourceApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RRoleApproverRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml
    M samples/demo/user-template.xml
    M testing/story/src/test/resources/common/user-administrator.xml
    M testing/story/src/test/resources/trafo/role-employee.xml

  Log Message:
  -----------
  Merge branch 'master' into ldap


  Commit: 0ac3c1e3fbae18e211fea71bb7388ca5af12bed7
      https://github.com/Evolveum/midpoint/commit/0ac3c1e3fbae18e211fea71bb7388ca5af12bed7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java

  Log Message:
  -----------
  Post-merge fix.


  Commit: 28fb328afb9c434a4fbe663c3a6e7b6a72a68724
      https://github.com/Evolveum/midpoint/commit/28fb328afb9c434a4fbe663c3a6e7b6a72a68724
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml

  Log Message:
  -----------
  TestUcfOpenDj partially adapted to new LDAP connector.


Compare: https://github.com/Evolveum/midpoint/compare/0ef960cf533a...28fb328afb9c


More information about the midPoint-svn mailing list