[midPoint-git] [Evolveum/midpoint] ee23ff: Reworked exclusion (SoD) detection algorithm to gi...
Petr Gašparík
petr at gasparik.cz
Tue Jan 31 12:13:58 CET 2017
Branch: refs/heads/transifex
Home: https://github.com/Evolveum/midpoint
Commit: ee23ffc81361c6eded14db4e86fd4dcf00874ac9
https://github.com/Evolveum/midpoint/commit/ee23ffc81361c6eded14db4e86fd4dcf00874ac9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/SourceTriple.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/AssignmentPathImpl.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/ConstructionPack.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/EvaluatedAssignmentTargetImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-corp-contractor.xml
M model/model-impl/src/test/resources/lens/role-corp-employee.xml
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
A model/model-impl/src/test/resources/lens/role-metarole-sod-notification.xml
Log Message:
-----------
Reworked exclusion (SoD) detection algorithm to give more precise (better defined) results. Added respective outputs to evaluated trigger and its XML representation.
Commit: 4fcbccd4ab902ab7a63a0ac9c2a4aad854a1ee14
https://github.com/Evolveum/midpoint/commit/4fcbccd4ab902ab7a63a0ac9c2a4aad854a1ee14
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
Log Message:
-----------
Fixed TestAssignmentProcessor
Commit: 4c379021844e34946f2823d2c7042b2c5fac8e11
https://github.com/Evolveum/midpoint/commit/4c379021844e34946f2823d2c7042b2c5fac8e11
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
Log Message:
-----------
Information about owner/path of rule origin moved to EvaluatedPolicyRuleTriggerType.
Commit: dc85cdad96b17537068403b0c7400d72a2c9cc0f
https://github.com/Evolveum/midpoint/commit/dc85cdad96b17537068403b0c7400d72a2c9cc0f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyDialog.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/schema/src/main/resources/localization/schema_es.properties
M infra/schema/src/main/resources/localization/schema_et.properties
M infra/schema/src/main/resources/localization/schema_hu.properties
M infra/schema/src/main/resources/localization/schema_pt_BR.properties
M infra/schema/src/main/resources/localization/schema_ru.properties
M infra/schema/src/main/resources/localization/schema_sk.properties
M model/model-common/pom.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ValueSetDefinition.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
A model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java
A model/model-common/src/test/resources/mapping/mapping-domain.xml
M model/model-common/testng-unit.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/resources/common/user-template-complex.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/object-template/role-autocratic.xml
A model/model-intest/src/test/resources/object-template/role-autodidactic.xml
A model/model-intest/src/test/resources/object-template/role-autographic.xml
A model/model-intest/src/test/resources/object-template/role-automatic.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestEntertainment.java
A testing/story/src/test/resources/entertainment/org-games-top.xml
A testing/story/src/test/resources/entertainment/org-poker.xml
A testing/story/src/test/resources/entertainment/resource-opendj.xml
A testing/story/src/test/resources/entertainment/role-meta-org-groups.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 4ee471bc40456a63914ced9676a47767a9db7559
https://github.com/Evolveum/midpoint/commit/4ee471bc40456a63914ced9676a47767a9db7559
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
A samples/forms/form-registration.xml
A samples/forms/form-reset-password.xml
Log Message:
-----------
custom form samples - registration, reset password
Commit: 65d35dc4f34f05bd60e4f8ef0381dd00e439eedc
https://github.com/Evolveum/midpoint/commit/65d35dc4f34f05bd60e4f8ef0381dd00e439eedc
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/SourceTriple.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/AssignmentPathImpl.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/ConstructionPack.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/EvaluatedAssignmentTargetImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-corp-contractor.xml
M model/model-impl/src/test/resources/lens/role-corp-employee.xml
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
A model/model-impl/src/test/resources/lens/role-metarole-sod-notification.xml
M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 3a91dcfe157a3b8b20e86c8c6572ed8071809ecc
https://github.com/Evolveum/midpoint/commit/3a91dcfe157a3b8b20e86c8c6572ed8071809ecc
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
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/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
Log Message:
-----------
small improvement for stypes (custom forms)
Commit: 9124b0c8aad155c5b72bb745a764d9c2310c8559
https://github.com/Evolveum/midpoint/commit/9124b0c8aad155c5b72bb745a764d9c2310c8559
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
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/component/prism/DynamicFormPanel.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
Unification of mapping and form schema
Commit: 48601182d6a2099048a5ea9e7fe5f5636c783cba
https://github.com/Evolveum/midpoint/commit/48601182d6a2099048a5ea9e7fe5f5636c783cba
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
Log Message:
-----------
Generating default "additional information" information for exclusion and generic triggers.
Commit: fcb47a01fe224c15679fe3c23b35fa767df21eac
https://github.com/Evolveum/midpoint/commit/fcb47a01fe224c15679fe3c23b35fa767df21eac
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
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/component/prism/DynamicFormPanel.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A samples/forms/form-registration.xml
A samples/forms/form-reset-password.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 9eeef96624d20d02ed324ce6d3d492ffaab813f1
https://github.com/Evolveum/midpoint/commit/9eeef96624d20d02ed324ce6d3d492ffaab813f1
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
M infra/schema/src/test/resources/common/json/no-ns/form.json
M infra/schema/src/test/resources/common/json/ns/form.json
M infra/schema/src/test/resources/common/xml/no-ns/form.xml
M infra/schema/src/test/resources/common/xml/ns/form.xml
M infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
M infra/schema/src/test/resources/common/yaml/ns/form.yaml
Log Message:
-----------
Fixed broken form parsing tests.
Commit: c9b08ac225fea59aa93d1d3553105551e5294b27
https://github.com/Evolveum/midpoint/commit/c9b08ac225fea59aa93d1d3553105551e5294b27
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
Log Message:
-----------
Tentative fix for MID-3706: in reconcile task with more then 1 workerThreads dry run option is ignored
Commit: 73e9c0cea343fad001d43e518c4e469ce85badb2
https://github.com/Evolveum/midpoint/commit/73e9c0cea343fad001d43e518c4e469ce85badb2
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
Log Message:
-----------
Fixing clone count
Commit: 987e0a8ed8fa48a09b6c4d6207b240f8c647ee14
https://github.com/Evolveum/midpoint/commit/987e0a8ed8fa48a09b6c4d6207b240f8c647ee14
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
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/component/prism/DynamicFormPanel.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
Log Message:
-----------
More form schema adjustements
Commit: 7673c360fd63e693857be7743f19f979a6d0dac9
https://github.com/Evolveum/midpoint/commit/7673c360fd63e693857be7743f19f979a6d0dac9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
Log Message:
-----------
First attempt at custom forms in work items (showing empty form only now). Limited ability to merge approval schema levels. Functionality to merge PCVs.
Commit: eb32c458963716410eadf0219d622300c87a2917
https://github.com/Evolveum/midpoint/commit/eb32c458963716410eadf0219d622300c87a2917
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
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/component/prism/DynamicFormPanel.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
A testing/story/src/test/resources/strings/orgs/2-role-catalog.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
A testing/story/src/test/resources/strings/roles-2/a-test-4.xml
A testing/story/src/test/resources/strings/roles/form-user-details.xml
A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint + preliminary version of custom forms in approvals
# Conflicts:
# infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Commit: e47ef8d21cc26ab4a2ab0dd453ba9c659f659f97
https://github.com/Evolveum/midpoint/commit/e47ef8d21cc26ab4a2ab0dd453ba9c659f659f97
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
Changed paths:
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/component/prism/DynamicFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M testing/story/src/test/resources/strings/roles-2/a-test-1.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
Log Message:
-----------
Preliminary version of custom forms in approvals
Commit: bf5c3fa92f89f6680c915d98020ddb64b3349141
https://github.com/Evolveum/midpoint/commit/bf5c3fa92f89f6680c915d98020ddb64b3349141
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
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/component/prism/DynamicFormPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
M infra/schema/src/test/resources/common/json/no-ns/form.json
M infra/schema/src/test/resources/common/json/ns/form.json
M infra/schema/src/test/resources/common/xml/no-ns/form.xml
M infra/schema/src/test/resources/common/xml/ns/form.xml
M infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
M infra/schema/src/test/resources/common/yaml/ns/form.yaml
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.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/util/Utils.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/TestModelServiceContract.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
A testing/story/src/test/resources/strings/orgs/2-role-catalog.xml
M testing/story/src/test/resources/strings/roles-2/a-test-1.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
A testing/story/src/test/resources/strings/roles-2/a-test-4.xml
A testing/story/src/test/resources/strings/roles/form-user-details.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 904e2539d725f45bf9537bd2c43d05c9001e1d2f
https://github.com/Evolveum/midpoint/commit/904e2539d725f45bf9537bd2c43d05c9001e1d2f
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
M samples/forms/form-registration.xml
M samples/forms/form-reset-password.xml
Log Message:
-----------
fixing form samples..
Commit: 59d4a8844e4742aeb5da81240933f0ee6f0be6dc
https://github.com/Evolveum/midpoint/commit/59d4a8844e4742aeb5da81240933f0ee6f0be6dc
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
M testing/story/src/test/resources/strings/users/cheese.xml
M testing/story/src/test/resources/strings/users/chef.xml
M testing/story/src/test/resources/strings/users/elaine.xml
Log Message:
-----------
Added forgotten approvers.
Commit: eb47078397ba88cac72a75d05c630925d5c1e3f4
https://github.com/Evolveum/midpoint/commit/eb47078397ba88cac72a75d05c630925d5c1e3f4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
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/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
M samples/forms/form-registration.xml
M samples/forms/form-reset-password.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 2e30b15eec1be8b28b29a2d2b8350cf80362dde4
https://github.com/Evolveum/midpoint/commit/2e30b15eec1be8b28b29a2d2b8350cf80362dde4
Author: honchar <honchar at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
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/webapp/less/midpoint-theme.less
Log Message:
-----------
deployment information is applied in GUI: header color, logo, application name
Commit: e7661b5d0afa56570499d850bc8a14bcd2b57eed
https://github.com/Evolveum/midpoint/commit/e7661b5d0afa56570499d850bc8a14bcd2b57eed
Author: honchar <honchar at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
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/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
M infra/schema/src/test/resources/common/json/no-ns/form.json
M infra/schema/src/test/resources/common/json/ns/form.json
M infra/schema/src/test/resources/common/xml/no-ns/form.xml
M infra/schema/src/test/resources/common/xml/ns/form.xml
M infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
M infra/schema/src/test/resources/common/yaml/ns/form.yaml
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/SourceTriple.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.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/ConstructionPack.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/EvaluatedAssignmentTargetImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.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/AbstractLensTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluatorDynamic.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-corp-contractor.xml
M model/model-impl/src/test/resources/lens/role-corp-employee.xml
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
A model/model-impl/src/test/resources/lens/role-metarole-sod-notification.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
A samples/forms/form-registration.xml
A samples/forms/form-reset-password.xml
A testing/story/src/test/resources/strings/orgs/2-role-catalog.xml
M testing/story/src/test/resources/strings/roles-2/a-test-1.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
M testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
A testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
A testing/story/src/test/resources/strings/roles-2/a-test-4.xml
A testing/story/src/test/resources/strings/roles/form-user-details.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
M testing/story/src/test/resources/strings/users/cheese.xml
M testing/story/src/test/resources/strings/users/chef.xml
M testing/story/src/test/resources/strings/users/elaine.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 5e741014cf0ed24c68271fd50dc46eb5f50f53be
https://github.com/Evolveum/midpoint/commit/5e741014cf0ed24c68271fd50dc46eb5f50f53be
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
Log Message:
-----------
Fixed bug of skipping process with no approvers (even with outcomeIfNoApprovers = reject).
Commit: 0f92643471ed817ec7e68da2b160f3accac75289
https://github.com/Evolveum/midpoint/commit/0f92643471ed817ec7e68da2b160f3accac75289
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
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/webapp/less/midpoint-theme.less
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 113f5b2e71544ee531b2bc07a293301fecfd4cd0
https://github.com/Evolveum/midpoint/commit/113f5b2e71544ee531b2bc07a293301fecfd4cd0
Author: honchar <honchar at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
Log Message:
-----------
some improvements for header color, logo, application name from deployment information
Commit: 70f818d9e3f4162aa72d16944175b5702ac27c58
https://github.com/Evolveum/midpoint/commit/70f818d9e3f4162aa72d16944175b5702ac27c58
Author: honchar <honchar at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 23e5bd1c9dfe4d90f83fc31281c8020a5d4982af
https://github.com/Evolveum/midpoint/commit/23e5bd1c9dfe4d90f83fc31281c8020a5d4982af
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-client/src/compile/resources/jax-ws-catalog.xml
M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
Log Message:
-----------
Factored out policy rules to common-policy-3.xsd.
Commit: ace8b0415e98b8c2084f3652bb926981c655deb9
https://github.com/Evolveum/midpoint/commit/ace8b0415e98b8c2084f3652bb926981c655deb9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 9f6f76b5dc2ce514b157260abbb25a3cbb7cc1f4
https://github.com/Evolveum/midpoint/commit/9f6f76b5dc2ce514b157260abbb25a3cbb7cc1f4
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
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/mapping/Mapping.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
Log Message:
-----------
Aligning mapping domain and range schemas
Commit: 1e10b92dd1b62fb2830f0dea5e0fe3fe5912f395
https://github.com/Evolveum/midpoint/commit/1e10b92dd1b62fb2830f0dea5e0fe3fe5912f395
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M model/model-common/pom.xml
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
M model/model-common/src/test/resources/mapping/mapping-script-transform.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
Log Message:
-----------
More tests for mappings + replace (MID-3700, MID-3701)
Commit: 5dcc3304452b9176b8b5098f68a0cf84fe7d0670
https://github.com/Evolveum/midpoint/commit/5dcc3304452b9176b8b5098f68a0cf84fe7d0670
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
M model/workflow-impl/src/test/resources/policy/metarole-security.xml
Log Message:
-----------
Assignment deletion approval.
Commit: bfab838cd727a970919b59f4a5acca01c4254bce
https://github.com/Evolveum/midpoint/commit/bfab838cd727a970919b59f4a5acca01c4254bce
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-common/pom.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
M model/model-common/src/test/resources/mapping/mapping-script-transform.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 7a4373d18d7c2fafd26149fd2a1015d70bf7080f
https://github.com/Evolveum/midpoint/commit/7a4373d18d7c2fafd26149fd2a1015d70bf7080f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
Log Message:
-----------
Samples: Form will be shown only for 'add assignment' operations.
Commit: 24759c89f3fdb41826da5c11c5605238a666905b
https://github.com/Evolveum/midpoint/commit/24759c89f3fdb41826da5c11c5605238a666905b
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.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/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.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/TestActivation.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Lifecycle and assignments (MID-3689)
Commit: 5a00514a8fc50ee2f58aaa4625b5717966d8aa42
https://github.com/Evolveum/midpoint/commit/5a00514a8fc50ee2f58aaa4625b5717966d8aa42
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
M model/workflow-impl/src/test/resources/policy/metarole-security.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 734731f3a57c8b9b07ab49bc6f387480a9bde253
https://github.com/Evolveum/midpoint/commit/734731f3a57c8b9b07ab49bc6f387480a9bde253
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
Log Message:
-----------
Fixed assignment deletion approval.
Commit: d63a16be4b38fbcf06d568947e10f81af5ef3f8f
https://github.com/Evolveum/midpoint/commit/d63a16be4b38fbcf06d568947e10f81af5ef3f8f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.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/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.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/TestActivation.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: bb8cd2c0e89d26468ab1308a1a19846b951b53bd
https://github.com/Evolveum/midpoint/commit/bb8cd2c0e89d26468ab1308a1a19846b951b53bd
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
Changed paths:
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
Log Message:
-----------
Fixed model-impl tests.
Commit: fd53a6927c5d3be2c8ab09f2c9bf2f8a33aa694f
https://github.com/Evolveum/midpoint/commit/fd53a6927c5d3be2c8ab09f2c9bf2f8a33aa694f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
Log Message:
-----------
Fixed "Resource wizard could not be open" bug.
Commit: 02168a073716f9b219f85a029b9066c26fd54521
https://github.com/Evolveum/midpoint/commit/02168a073716f9b219f85a029b9066c26fd54521
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
Changed paths:
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
Log Message:
-----------
Fixed the fix for MID-3706 (dryRun for parallel tasks)
Commit: 11e0eacaec1a81246841365d18edd1f7142dc8cd
https://github.com/Evolveum/midpoint/commit/11e0eacaec1a81246841365d18edd1f7142dc8cd
Author: honchar <honchar at evolveum.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
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
Log Message:
-----------
improvements for deployment information is applied in GUI: header color, logo, application name
Commit: 760b2394a7d6575adc3072be9f5bc8beeca35f82
https://github.com/Evolveum/midpoint/commit/760b2394a7d6575adc3072be9f5bc8beeca35f82
Author: honchar <honchar at evolveum.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-client/src/compile/resources/jax-ws-catalog.xml
M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
M model/model-common/pom.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
M model/model-common/src/test/resources/mapping/mapping-script-transform.xml
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/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.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/TestPolicyRules.java
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
M model/workflow-impl/src/test/resources/policy/metarole-security.xml
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 682fb532551fb144e61eec8c13a346240e9bd427
https://github.com/Evolveum/midpoint/commit/682fb532551fb144e61eec8c13a346240e9bd427
Author: Petr Gašparík <petr at gasparik.cz>
Date: 2017-01-31 (Tue, 31 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
Log Message:
-----------
Translation update, WIP
Compare: https://github.com/Evolveum/midpoint/compare/a5ce3e719cc6...682fb532551f
More information about the midPoint-svn
mailing list