[midPoint-git] [Evolveum/midpoint] d1fe4c: Fix Oracle Quartz DB init script

Radovan Semancik radovan.semancik at evolveum.com
Mon Oct 1 18:55:11 CEST 2018


  Branch: refs/heads/feature/ad-connector-improvements-3.9
  Home:   https://github.com/Evolveum/midpoint
  Commit: d1fe4ca95653274a7abee85c89e36ad6ef8cd48b
      https://github.com/Evolveum/midpoint/commit/d1fe4ca95653274a7abee85c89e36ad6ef8cd48b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M config/sql/_all/oracle-3.9-all.sql
    M config/sql/quartz/tables_oracle.sql

  Log Message:
  -----------
  Fix Oracle Quartz DB init script

(cherry picked from commit 78a4731b73cf3dcfa65f48964d64255b767a55ea)


  Commit: 1c4e777a5e49609ebb78870f7c153978676107f0
      https://github.com/Evolveum/midpoint/commit/1c4e777a5e49609ebb78870f7c153978676107f0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M config/sql/_all/oracle-3.9-all.sql

  Log Message:
  -----------
  Fix oracle-3.9-all.sql script

The part that drops Quartz tables is not executable
by our ScriptRunner. Instead of fixing it we can simply
remove that part, as we expect that the tables do not
exist before (just like midPoint and Activiti ones).

(cherry picked from commit 3c1f9c718d2786ab8e38bd580c35b076ebb12490)


  Commit: 5464758e24b1c17db682ae12a7d1d936ed69ff9d
      https://github.com/Evolveum/midpoint/commit/5464758e24b1c17db682ae12a7d1d936ed69ff9d
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java

  Log Message:
  -----------
  Add to cart behavior changes


  Commit: b739e771b0e3fa6bc74062b7f3d30da79baf3088
      https://github.com/Evolveum/midpoint/commit/b739e771b0e3fa6bc74062b7f3d30da79baf3088
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/oracle-3.9-all.sql
    M config/sql/quartz/tables_oracle.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/relation/RelationRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    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/util/ModelImplUtils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTolerantAttributes.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    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/ProvisioningOperationOptions.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/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.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/errorhandling/ConfigurationExceptionHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/ErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/ErrorHandlerLocator.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/GenericErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/HardErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/ObjectNotFoundHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/PolicyViolationHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/SchemaExceptionHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/SecurityViolationHandler.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorDiscovery.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractModificationConverter.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/DeltaModificationConverter.java
    M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapCookedTest.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapRawTest.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AdUtils.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapChimera.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapLocalhost.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapMedusa.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapRawLocalhost.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapRawMedusa.java
    R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLocalhost.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapCookedTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapRawTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapChimera.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapChimeraRunAs.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapLocalhost.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapMedusa.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapRawLocalhost.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapRawMedusa.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLocalhost.java
    A testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera-runas.xml
    A testing/conntest/src/test/resources/common/role-end-user.xml
    M testing/conntest/src/test/resources/common/system-configuration.xml
    M testing/conntest/src/test/resources/logback-test.xml
    M testing/conntest/testng-integration.xml

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


  Commit: 8650345f4b306df3732f29974abdc0fe63c64a3a
      https://github.com/Evolveum/midpoint/commit/8650345f4b306df3732f29974abdc0fe63c64a3a
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

  Log Message:
  -----------
  small code cleanup


  Commit: 90de699a1e149727cecb1de68c7475c09bc8e460
      https://github.com/Evolveum/midpoint/commit/90de699a1e149727cecb1de68c7475c09bc8e460
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SchemaChecker.java

  Log Message:
  -----------
  Set TX isolation for SQL Server initialization

The snapshot isolation does not work here, getting "Transaction failed
because this DDL statement is not allowed inside a snapshot isolation
transaction. Since metadata is not versioned, a metadata change can
lead to inconsistency if mixed within snapshot isolation."


  Commit: 17eb7b3b364895b9e6539bd4baf2f0808ca2af98
      https://github.com/Evolveum/midpoint/commit/17eb7b3b364895b9e6539bd4baf2f0808ca2af98
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java

  Log Message:
  -----------
  Switch to LDAP connector 2.0-M3, more tests for runAs errors (MID-4661)


  Commit: 937f3e757b257f87c8bb9fb3a9632b6ecc3d101c
      https://github.com/Evolveum/midpoint/commit/937f3e757b257f87c8bb9fb3a9632b6ecc3d101c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

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


  Commit: c9b5d4fd35b73eb9084124cd27011db6804c9ee2
      https://github.com/Evolveum/midpoint/commit/c9b5d4fd35b73eb9084124cd27011db6804c9ee2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    A gui/admin-gui/src/main/resources/static/css/font-evosome.css
    R gui/admin-gui/src/main/resources/static/css/font-midpoint.css
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.eot
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.svg
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.ttf
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.woff
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

  Log Message:
  -----------
  font evosome integrated into base page


  Commit: 842cae04bb31714dab0dcb1ce64593fa521d0869
      https://github.com/Evolveum/midpoint/commit/842cae04bb31714dab0dcb1ce64593fa521d0869
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningOperationOptions.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java

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


  Commit: 91420be5a6457b7e35f3513118cfdcddb28918bd
      https://github.com/Evolveum/midpoint/commit/91420be5a6457b7e35f3513118cfdcddb28918bd
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html

  Log Message:
  -----------
  removing mistake in InducedEntitlementsPanel.html


  Commit: 2a0d54bc86bf2b9b7c90d4d0ab3514754a965fb9
      https://github.com/Evolveum/midpoint/commit/2a0d54bc86bf2b9b7c90d4d0ab3514754a965fb9
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

  Log Message:
  -----------
  MID-4867 3. 5. 6. and 11. points


  Commit: 77dd2960e79de5fb7975fda12dc0f099a9de1562
      https://github.com/Evolveum/midpoint/commit/77dd2960e79de5fb7975fda12dc0f099a9de1562
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/oracle-3.9-all.sql
    M config/sql/quartz/tables_oracle.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    A gui/admin-gui/src/main/resources/static/css/font-evosome.css
    R gui/admin-gui/src/main/resources/static/css/font-midpoint.css
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.eot
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.svg
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.ttf
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.woff
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/relation/RelationRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningOperationOptions.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: aa489edfd6f2f9b107711f5d14e09b3bff30c26f
      https://github.com/Evolveum/midpoint/commit/aa489edfd6f2f9b107711f5d14e09b3bff30c26f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

  Log Message:
  -----------
  fixing GUI tests


  Commit: a61de514ce6d1b803d86382166db8cc144770c93
      https://github.com/Evolveum/midpoint/commit/a61de514ce6d1b803d86382166db8cc144770c93
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/oracle-3.9-all.sql
    M config/sql/quartz/tables_oracle.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.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/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    A gui/admin-gui/src/main/resources/static/css/font-evosome.css
    R gui/admin-gui/src/main/resources/static/css/font-midpoint.css
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.eot
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.svg
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.ttf
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.woff
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/relation/RelationRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningOperationOptions.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java

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


  Commit: e345c7ca689b55c2ca207df9aac47a04037a72af
      https://github.com/Evolveum/midpoint/commit/e345c7ca689b55c2ca207df9aac47a04037a72af
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

  Log Message:
  -----------
  default view type for shop cart page


  Commit: 7f3c86d24c560acfd19a8786bbac8ad773d642fb
      https://github.com/Evolveum/midpoint/commit/7f3c86d24c560acfd19a8786bbac8ad773d642fb
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    A gui/admin-gui/src/main/resources/static/css/font-evosome.css
    R gui/admin-gui/src/main/resources/static/css/font-midpoint.css
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    A gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.eot
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.svg
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.ttf
    R gui/admin-gui/src/main/resources/static/fonts/font-midpoint.woff
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdUtils.java

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


  Commit: c5220003a670ab81257404e6ac0673e2a4f851bc
      https://github.com/Evolveum/midpoint/commit/c5220003a670ab81257404e6ac0673e2a4f851bc
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java

  Log Message:
  -----------
  fix for MID-4915


  Commit: 4396b72b55cfc7ceaa7cffdfa1c8d8111aefc88f
      https://github.com/Evolveum/midpoint/commit/4396b72b55cfc7ceaa7cffdfa1c8d8111aefc88f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

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


  Commit: a1482b1fd0acbfc979ca99576ca1869744893b1c
      https://github.com/Evolveum/midpoint/commit/a1482b1fd0acbfc979ca99576ca1869744893b1c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/static/css/font-evosome.css
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff

  Log Message:
  -----------
  updated font evosome


  Commit: 34e12321d493603d86fface4d5c4903cde64e7f2
      https://github.com/Evolveum/midpoint/commit/34e12321d493603d86fface4d5c4903cde64e7f2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
    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/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

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


  Commit: 528316b65cbcd499fc89ab36a951d6a5e6ae383a
      https://github.com/Evolveum/midpoint/commit/528316b65cbcd499fc89ab36a951d6a5e6ae383a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  missing localization key


  Commit: d358bbd802d13e26eb789b229c3087e0b5b002ff
      https://github.com/Evolveum/midpoint/commit/d358bbd802d13e26eb789b229c3087e0b5b002ff
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/static/css/font-evosome.css
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff

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


  Commit: 975a2bf72bc2c74495d1bd872294b2a21d9ea579
      https://github.com/Evolveum/midpoint/commit/975a2bf72bc2c74495d1bd872294b2a21d9ea579
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java

  Log Message:
  -----------
  relation fix for shop cart item properties panel


  Commit: 34f267e8bbc088f425a203416abf4694ecafc97a
      https://github.com/Evolveum/midpoint/commit/34f267e8bbc088f425a203416abf4694ecafc97a
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/resources/static/css/font-evosome.css
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    M infra/schema/src/main/resources/localization/schema.properties

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


  Commit: c71a0821b75f7d96ab6291c5900a0aa0e9a7dbe9
      https://github.com/Evolveum/midpoint/commit/c71a0821b75f7d96ab6291c5900a0aa0e9a7dbe9
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java

  Log Message:
  -----------
  style fix for archived/disabled shop cart items


  Commit: d24fe87c35e1fa151c910767e3e9c07c337d91ea
      https://github.com/Evolveum/midpoint/commit/d24fe87c35e1fa151c910767e3e9c07c337d91ea
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less

  Log Message:
  -----------
  MID-4912


  Commit: a39293b501c4a82d5617492fe131e8658b154f95
      https://github.com/Evolveum/midpoint/commit/a39293b501c4a82d5617492fe131e8658b154f95
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/static/css/font-evosome.css
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: 37722842cae5c048ac56e2d3d13530109ab7ddc8
      https://github.com/Evolveum/midpoint/commit/37722842cae5c048ac56e2d3d13530109ab7ddc8
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  MID-4897


  Commit: 3964c909ce9f786ffabf8aa82f49fb6e19d3cfb4
      https://github.com/Evolveum/midpoint/commit/3964c909ce9f786ffabf8aa82f49fb6e19d3cfb4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java

  Log Message:
  -----------
  fix for MID-4914


  Commit: f177f71de0f9d31ef2ca06733dadda522bc35fd4
      https://github.com/Evolveum/midpoint/commit/f177f71de0f9d31ef2ca06733dadda522bc35fd4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less

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


  Commit: 6e3d1927bd5ffaaa9bed493e039129aa9ab038f1
      https://github.com/Evolveum/midpoint/commit/6e3d1927bd5ffaaa9bed493e039129aa9ab038f1
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java

  Log Message:
  -----------
  MID-4489 password visibility on projection tab


  Commit: 954afea7d7c396c687f39372f400befe50f1fdc5
      https://github.com/Evolveum/midpoint/commit/954afea7d7c396c687f39372f400befe50f1fdc5
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less

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


  Commit: 6074f7c2c9c9034ce93ac0e05aad123dbed76633
      https://github.com/Evolveum/midpoint/commit/6074f7c2c9c9034ce93ac0e05aad123dbed76633
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-24 (Mon, 24 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    A gui/admin-gui/src/main/resources/logback-alt.xml
    R gui/admin-gui/src/main/resources/logback-console.xml
    M gui/admin-gui/src/main/resources/logback.xml
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefiner.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsolePrefix.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsoleTimezone.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForTimezone.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java

  Log Message:
  -----------
  Generalize console appender to "alt" appender

This is to match TIER logging requirements more precisely.


  Commit: a0926cad6008c24361f0c61cfe3845650d508a23
      https://github.com/Evolveum/midpoint/commit/a0926cad6008c24361f0c61cfe3845650d508a23
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

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

  Log Message:
  -----------
  MID-4911


  Commit: 67ae7aa1e8a001c9c51bbd772ca8ce2e0bd8b6a9
      https://github.com/Evolveum/midpoint/commit/67ae7aa1e8a001c9c51bbd772ca8ce2e0bd8b6a9
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: ec6621cb0b3520abff01373def1774ca34b47099
      https://github.com/Evolveum/midpoint/commit/ec6621cb0b3520abff01373def1774ca34b47099
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4910


  Commit: f9f6053a861c7fb7efe5e551d608300d24abf5bf
      https://github.com/Evolveum/midpoint/commit/f9f6053a861c7fb7efe5e551d608300d24abf5bf
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/resources/static/js/midpoint-theme.js
    M gui/admin-gui/src/main/resources/static/less/admin-lte/less/core.less

  Log Message:
  -----------
  MID-4725 footer improvement, removed changes from library javascripts (adminlte)


  Commit: 7010e8ecaef2350fd5d5d9feb691907576e4549c
      https://github.com/Evolveum/midpoint/commit/7010e8ecaef2350fd5d5d9feb691907576e4549c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


  Commit: 6cba157d6d29a30023e792278f470c9598945e99
      https://github.com/Evolveum/midpoint/commit/6cba157d6d29a30023e792278f470c9598945e99
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html

  Log Message:
  -----------
  MID-4901


  Commit: f53d419dd8978298f8ad307113fddfcf89ea5ba0
      https://github.com/Evolveum/midpoint/commit/f53d419dd8978298f8ad307113fddfcf89ea5ba0
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html

  Log Message:
  -----------
  MID-4912 2. point


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

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    A gui/admin-gui/src/main/resources/logback-alt.xml
    M gui/admin-gui/src/main/resources/logback-console.xml
    M gui/admin-gui/src/main/resources/logback.xml
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefiner.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsolePrefix.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsoleTimezone.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForTimezone.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SchemaChecker.java

  Log Message:
  -----------
  Merge branch 'tmp/tier'

# Conflicts:
#	gui/admin-gui/src/main/resources/logback-console.xml
#	infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java


  Commit: 9c9eab4f118317e899cd292c2b53ee1c32f2b6d4
      https://github.com/Evolveum/midpoint/commit/9c9eab4f118317e899cd292c2b53ee1c32f2b6d4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    R gui/admin-gui/src/main/resources/logback-console.xml

  Log Message:
  -----------
  Fix merge conflicts


  Commit: 7fc3ea6e0383a17bd513f2adbed4a8848143a336
      https://github.com/Evolveum/midpoint/commit/7fc3ea6e0383a17bd513f2adbed4a8848143a336
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-09-25 (Tue, 25 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html

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


  Commit: 165d689191acfeeeda4bd401f90fada5915442d9
      https://github.com/Evolveum/midpoint/commit/165d689191acfeeeda4bd401f90fada5915442d9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/EmbeddedTomcatAutoConfiguration.java

  Log Message:
  -----------
  Improved embedded tomcat configuration, tomcat 8 support fixed (not recommended)


  Commit: 367f802b83e9671e44346cb9b724e6b080dda2e8
      https://github.com/Evolveum/midpoint/commit/367f802b83e9671e44346cb9b724e6b080dda2e8
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

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

  Log Message:
  -----------
  MID-4521 Policy breach message is not localized in self-service


  Commit: fa02861a05c59a11cfb83829f61f4b0953046382
      https://github.com/Evolveum/midpoint/commit/fa02861a05c59a11cfb83829f61f4b0953046382
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/EmbeddedTomcatAutoConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A gui/admin-gui/src/main/resources/logback-alt.xml
    R gui/admin-gui/src/main/resources/logback-console.xml
    M gui/admin-gui/src/main/resources/logback.xml
    M gui/admin-gui/src/main/resources/static/js/midpoint-theme.js
    M gui/admin-gui/src/main/resources/static/less/admin-lte/less/core.less
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefiner.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsolePrefix.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForConsoleTimezone.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/LogbackPropertyDefinerForTimezone.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SchemaChecker.java

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


  Commit: f2c8c5734be44260218cb1083b113385c30335eb
      https://github.com/Evolveum/midpoint/commit/f2c8c5734be44260218cb1083b113385c30335eb
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

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

  Log Message:
  -----------
  removed second op.res. panel from shop cart


  Commit: fc1ca3f55d8a32ff975a976d29cce2450b7612d5
      https://github.com/Evolveum/midpoint/commit/fc1ca3f55d8a32ff975a976d29cce2450b7612d5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/projector/focus/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    M samples/stories/multitenant-simple/multitenant-orgs-users-roles.xml

  Log Message:
  -----------
  More tests for multitenancy autz, fix of second-level tenantRef problem (MID-4882)


  Commit: 7854d6c4699836c5d9a9f30f77bec5039bd09e4f
      https://github.com/Evolveum/midpoint/commit/7854d6c4699836c5d9a9f30f77bec5039bd09e4f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    A model/model-intest/src/test/resources/security/multitenant/org-arrakis.xml
    A model/model-intest/src/test/resources/security/multitenant/org-castle-caladan.xml
    A model/model-intest/src/test/resources/security/multitenant/org-giedi-prime.xml
    A model/model-intest/src/test/resources/security/multitenant/org-junction.xml

  Log Message:
  -----------
  Forgotten files (MID-4882)


  Commit: 54c48798f1ae3583a9b5976fd27ebf1f775ccd30
      https://github.com/Evolveum/midpoint/commit/54c48798f1ae3583a9b5976fd27ebf1f775ccd30
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

  Log Message:
  -----------
  search storage for shop cart tabs


  Commit: 7bf099b1ba71d917031c8893b9f7ef494e56a18a
      https://github.com/Evolveum/midpoint/commit/7bf099b1ba71d917031c8893b9f7ef494e56a18a
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/projector/focus/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    A model/model-intest/src/test/resources/security/multitenant/org-arrakis.xml
    A model/model-intest/src/test/resources/security/multitenant/org-castle-caladan.xml
    A model/model-intest/src/test/resources/security/multitenant/org-giedi-prime.xml
    A model/model-intest/src/test/resources/security/multitenant/org-junction.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    M samples/stories/multitenant-simple/multitenant-orgs-users-roles.xml

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


  Commit: 85794f4d43c8ef6cf2a27f7f44638ebe62a22073
      https://github.com/Evolveum/midpoint/commit/85794f4d43c8ef6cf2a27f7f44638ebe62a22073
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java

  Log Message:
  -----------
  small refactoring


  Commit: 7fa03a15ee959dd754d07d03866330b8343be846
      https://github.com/Evolveum/midpoint/commit/7fa03a15ee959dd754d07d03866330b8343be846
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java

  Log Message:
  -----------
  shop cart relation


  Commit: 3bf3fe981f78f4156e74da7f0ded4079d40e7558
      https://github.com/Evolveum/midpoint/commit/3bf3fe981f78f4156e74da7f0ded4079d40e7558
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    A model/model-intest/src/test/resources/security/multitenant/org-atreides-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-guild-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-harkonnen-subtenant.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Implementing includeTenantOrg in tenant authorizations (MID-4882)


  Commit: ad6c9b06883cf6e4ffa219acdb80802c354d64d5
      https://github.com/Evolveum/midpoint/commit/ad6c9b06883cf6e4ffa219acdb80802c354d64d5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-26 (Wed, 26 Sep 2018)

  Changed paths:
    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/prism/show/PagePreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

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


  Commit: 734e5125109dec019c2e3547ac47c9a06e69eaa1
      https://github.com/Evolveum/midpoint/commit/734e5125109dec019c2e3547ac47c9a06e69eaa1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-guard.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Authorization fixes - object type checking


  Commit: 7166cf8c29c72eca92a917f78f3ef92b9f7e086f
      https://github.com/Evolveum/midpoint/commit/7166cf8c29c72eca92a917f78f3ef92b9f7e086f
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

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

  Log Message:
  -----------
  MID-4916 redirect for in_progress results


  Commit: cbc894e38297ec0f6d51e1033dd99607aa0d4bb6
      https://github.com/Evolveum/midpoint/commit/cbc894e38297ec0f6d51e1033dd99607aa0d4bb6
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/multitenant/org-atreides-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-guild-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-harkonnen-subtenant.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-guard.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: f9b1002ef7b7978bc229baadba08e79e25c4f295
      https://github.com/Evolveum/midpoint/commit/f9b1002ef7b7978bc229baadba08e79e25c4f295
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java

  Log Message:
  -----------
  ignore missing header for sso profile


  Commit: ec4172618e10ea2d34b62f3dd8582dfbf3a24f92
      https://github.com/Evolveum/midpoint/commit/ec4172618e10ea2d34b62f3dd8582dfbf3a24f92
  Author: skublik <lskublik at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-guard.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: d9861b398aa2a9d913229df914efd650fe01f97c
      https://github.com/Evolveum/midpoint/commit/d9861b398aa2a9d913229df914efd650fe01f97c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

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

  Log Message:
  -----------
  probably fix for MID-4821


  Commit: 87756535ac626c055d50a0e292d0c4dcd82ec432
      https://github.com/Evolveum/midpoint/commit/87756535ac626c055d50a0e292d0c4dcd82ec432
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-guard.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: bbec87cce6831feea245baaa66bc13e5829dd713
      https://github.com/Evolveum/midpoint/commit/bbec87cce6831feea245baaa66bc13e5829dd713
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java

  Log Message:
  -----------
  MID-3360 preview changes for unexisting object fix


  Commit: 424d8bdf4874b4dffc9da7188f1e2e7356cbea31
      https://github.com/Evolveum/midpoint/commit/424d8bdf4874b4dffc9da7188f1e2e7356cbea31
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java

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


  Commit: 8776a13ac062aa325f2bfbdf8cb8f8f01c4a4c87
      https://github.com/Evolveum/midpoint/commit/8776a13ac062aa325f2bfbdf8cb8f8f01c4a4c87
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-28 (Fri, 28 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferencePopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  relation query fix for reference search panel


  Commit: e0aa3bd6fd002d338e3d9c84405ebe0440d7e4de
      https://github.com/Evolveum/midpoint/commit/e0aa3bd6fd002d338e3d9c84405ebe0440d7e4de
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-28 (Fri, 28 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java

  Log Message:
  -----------
  improved authentication provider initialization, web security init still needs cleanup


  Commit: 69227c88de47d19189eff95980f473e4704b6e7f
      https://github.com/Evolveum/midpoint/commit/69227c88de47d19189eff95980f473e4704b6e7f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-09-28 (Fri, 28 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferencePopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/multitenant/org-arrakis.xml
    A model/model-intest/src/test/resources/security/multitenant/org-atreides-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-castle-caladan.xml
    A model/model-intest/src/test/resources/security/multitenant/org-giedi-prime.xml
    A model/model-intest/src/test/resources/security/multitenant/org-guild-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-harkonnen-subtenant.xml
    A model/model-intest/src/test/resources/security/multitenant/org-junction.xml
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-guard.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M samples/stories/multitenant-simple/multitenant-orgs-users-roles.xml

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


  Commit: 935598a16d092b135f42e90fcd41723173f0829a
      https://github.com/Evolveum/midpoint/commit/935598a16d092b135f42e90fcd41723173f0829a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-28 (Fri, 28 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ObjectDeltaObject.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.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/MappingDiagEvaluator.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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathVariables.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/PersonaProcessor.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocalMappingSpec.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.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/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.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/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLifecycle.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-jack.xml
    M model/model-intest/src/test/resources/common/user-largo.xml
    M model/model-intest/src/test/resources/common/user-rapp.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template-inbounds.xml
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/gensync/user-otis.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.json
    M model/model-intest/src/test/resources/importer/import-users-overwrite.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.json
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.xml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.yaml
    M model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
    M model/model-intest/src/test/resources/password/resource-dummy-lifecycle.xml
    M model/model-intest/src/test/resources/preview/resource-dummy-lemon.xml
    M model/model-intest/src/test/resources/preview/user-rogers.xml
    M model/model-intest/src/test/resources/rbac/role-wannabe.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/model-intest/src/test/resources/security/role-conditional.xml
    M model/model-intest/src/test/resources/security/role-end-user-with-privacy.xml
    M model/model-intest/src/test/resources/security/role-filter-object-user-type-shadow.xml
    M model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype-escape.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype.xml
    M model/model-intest/src/test/resources/security/user-angelica.xml
    M model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
    M model/model-intest/src/test/resources/volatility/user-largo-with-assignment.xml
    M repo/repo-common/pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ItemDeltaItem.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ObjectDeltaObject.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Source.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/EncodingTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/OrgAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/PrismObjectAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AuthorizationParameters.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Authorization zone of control, cleaning up the intests.


  Commit: 69aa7a62508174986a483d4e7b55697f93473f72
      https://github.com/Evolveum/midpoint/commit/69aa7a62508174986a483d4e7b55697f93473f72
  Author: kate <honchar at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgTreeStateStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java

  Log Message:
  -----------
  session storage for "expand all" org tree state


  Commit: 70c987cd9e213fca123afa57b90da7354308b5a4
      https://github.com/Evolveum/midpoint/commit/70c987cd9e213fca123afa57b90da7354308b5a4
  Author: kate <honchar at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ObjectDeltaObject.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.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/MappingDiagEvaluator.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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathVariables.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/PersonaProcessor.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocalMappingSpec.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.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/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.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/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLifecycle.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-jack.xml
    M model/model-intest/src/test/resources/common/user-largo.xml
    M model/model-intest/src/test/resources/common/user-rapp.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template-inbounds.xml
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/gensync/user-otis.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.json
    M model/model-intest/src/test/resources/importer/import-users-overwrite.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.json
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.xml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.yaml
    M model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
    M model/model-intest/src/test/resources/password/resource-dummy-lifecycle.xml
    M model/model-intest/src/test/resources/preview/resource-dummy-lemon.xml
    M model/model-intest/src/test/resources/preview/user-rogers.xml
    M model/model-intest/src/test/resources/rbac/role-wannabe.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/model-intest/src/test/resources/security/role-conditional.xml
    M model/model-intest/src/test/resources/security/role-end-user-with-privacy.xml
    M model/model-intest/src/test/resources/security/role-filter-object-user-type-shadow.xml
    M model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype-escape.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype.xml
    M model/model-intest/src/test/resources/security/user-angelica.xml
    M model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
    M model/model-intest/src/test/resources/volatility/user-largo-with-assignment.xml
    M repo/repo-common/pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ItemDeltaItem.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ObjectDeltaObject.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Source.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/EncodingTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/OrgAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/PrismObjectAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AuthorizationParameters.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 90a7ecfc41cf34048fa4b877d4affa0499dfe09b
      https://github.com/Evolveum/midpoint/commit/90a7ecfc41cf34048fa4b877d4affa0499dfe09b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  fixing MID-4914


  Commit: 75f569304b424fb6b99afa32de8036ff59344cd1
      https://github.com/Evolveum/midpoint/commit/75f569304b424fb6b99afa32de8036ff59344cd1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferencePopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgTreeStateStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ObjectDeltaObject.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.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/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.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/MappingDiagEvaluator.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/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.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/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathVariables.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/PersonaProcessor.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocalMappingSpec.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.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/visualizer/Visualizer.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.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/TestInbounds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLifecycle.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-jack.xml
    M model/model-intest/src/test/resources/common/user-largo.xml
    M model/model-intest/src/test/resources/common/user-rapp.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template-inbounds.xml
    M model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/gensync/user-otis.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.json
    M model/model-intest/src/test/resources/importer/import-users-overwrite.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.json
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.xml
    M model/model-intest/src/test/resources/importer/user-constrained-wrong.yaml
    M model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
    M model/model-intest/src/test/resources/password/resource-dummy-lifecycle.xml
    M model/model-intest/src/test/resources/preview/resource-dummy-lemon.xml
    M model/model-intest/src/test/resources/preview/user-rogers.xml
    M model/model-intest/src/test/resources/rbac/role-wannabe.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/model-intest/src/test/resources/security/role-conditional.xml
    M model/model-intest/src/test/resources/security/role-end-user-with-privacy.xml
    M model/model-intest/src/test/resources/security/role-filter-object-user-type-shadow.xml
    M model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
    M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype-escape.xml
    A model/model-intest/src/test/resources/security/role-prop-subtype.xml
    M model/model-intest/src/test/resources/security/user-angelica.xml
    M model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
    M model/model-intest/src/test/resources/volatility/user-largo-with-assignment.xml
    M repo/repo-common/pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ItemDeltaItem.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ObjectDeltaObject.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Source.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/EncodingTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/OrgAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/PrismObjectAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AuthorizationParameters.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 0350a775768b350c861bdf4c940c4ab194998a36
      https://github.com/Evolveum/midpoint/commit/0350a775768b350c861bdf4c940c4ab194998a36
  Author: kate <honchar at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

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

  Log Message:
  -----------
  query fix for shop cart


  Commit: c31b7566a120b94fd8b4984a4beb960fb7aba24b
      https://github.com/Evolveum/midpoint/commit/c31b7566a120b94fd8b4984a4beb960fb7aba24b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

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

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


  Commit: b35ad9d03e181692f699f794bc550a4083e535da
      https://github.com/Evolveum/midpoint/commit/b35ad9d03e181692f699f794bc550a4083e535da
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityMultitenant.java
    M model/model-intest/src/test/resources/security/multitenant/org-multitenant.xml
    A model/model-intest/src/test/resources/security/multitenant/role-atreides-hacker.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  More authorization tests


  Commit: 2f6ec737948a44ef7a6f30fc08e28c289a5e8540
      https://github.com/Evolveum/midpoint/commit/2f6ec737948a44ef7a6f30fc08e28c289a5e8540
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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: a861d33a6284fc346f76520d7df694040bff627e
      https://github.com/Evolveum/midpoint/commit/a861d33a6284fc346f76520d7df694040bff627e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-10-01 (Mon, 01 Oct 2018)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
    M testing/conntest/src/test/resources/opendj-dumber/resource.xml

  Log Message:
  -----------
  Test for additional LDAP search filter (MID-4925)


Compare: https://github.com/Evolveum/midpoint/compare/56eb1a00c274...a861d33a6284
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the midPoint-svn mailing list