From cfb59be755d3e1dc114ae41d38e4d8a0b83c89db Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Mon, 29 Jul 2019 12:10:50 +0200 Subject: [PATCH] Adapt demo/complex2s to latest perf improvements The processing path of Grouper groups was significantly changed: Instead of pushing member information through ShadowType to OrgType we keep it only in ShadowType (in index-only form). Auto-updating users after membership change is currently disabled. --- .../objectTemplates/template-user.xml | 79 ++++++++++++++----- .../resources/resource-grouper.xml | 9 --- .../SystemConfiguration.xml | 31 ++------ .../container_files/mp-home/config.xml | 64 +++++++++++++++ 4 files changed, 131 insertions(+), 52 deletions(-) create mode 100644 demo/complex2s/midpoint_server/container_files/mp-home/config.xml diff --git a/demo/complex2s/midpoint-objects/objectTemplates/template-user.xml b/demo/complex2s/midpoint-objects/objectTemplates/template-user.xml index 7079a1d..8c7959f 100644 --- a/demo/complex2s/midpoint-objects/objectTemplates/template-user.xml +++ b/demo/complex2s/midpoint-objects/objectTemplates/template-user.xml @@ -7,24 +7,67 @@ name - - OrgType - - - extension/member - - - - - - - grouper-group - - + assignment diff --git a/demo/complex2s/midpoint-objects/resources/resource-grouper.xml b/demo/complex2s/midpoint-objects/resources/resource-grouper.xml index eafe0ff..6de99bd 100644 --- a/demo/complex2s/midpoint-objects/resources/resource-grouper.xml +++ b/demo/complex2s/midpoint-objects/resources/resource-grouper.xml @@ -130,15 +130,6 @@ ri:member explicit - - strong - - extension/member - - all - - - diff --git a/demo/complex2s/midpoint-objects/systemConfigurations/SystemConfiguration.xml b/demo/complex2s/midpoint-objects/systemConfigurations/SystemConfiguration.xml index 74fb152..27d67ff 100644 --- a/demo/complex2s/midpoint-objects/systemConfigurations/SystemConfiguration.xml +++ b/demo/complex2s/midpoint-objects/systemConfigurations/SystemConfiguration.xml @@ -1,29 +1,7 @@ SystemConfiguration - - 2018-08-15T13:30:55.282+02:00 - 2018-08-15T13:30:55.372+02:00 - http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#init - - - 2018-08-15T13:30:55.562+02:00 - - - add - c:SystemConfigurationType - - - com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta - handled_error - 1000000000000000009 - Object of type 'SystemConfigurationType' with oid '00000000-0000-0000-0000-000000000001' was not found. - - SystemConfiguration - - handled_error - http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#init - + ERROR @@ -271,6 +249,9 @@ + + demo/complex2s + /self/profile @@ -312,6 +293,6 @@ purple http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#resources - false + true diff --git a/demo/complex2s/midpoint_server/container_files/mp-home/config.xml b/demo/complex2s/midpoint_server/container_files/mp-home/config.xml new file mode 100644 index 0000000..5a4e0ea --- /dev/null +++ b/demo/complex2s/midpoint_server/container_files/mp-home/config.xml @@ -0,0 +1,64 @@ + + + + + + ${midpoint.home}/import + + + com.evolveum.midpoint.repo.sql.SqlRepositoryFactory + ${midpoint.home} + true + true + true + true + + + + com.evolveum.midpoint.audit.impl.LoggerAuditServiceFactory + + + com.evolveum.midpoint.repo.sql.SqlAuditServiceFactory + + + + true + ${midpoint.home}/icf-connectors + + + ${midpoint.home}/keystore.jceks + changeit + default + + + + +