[midPoint-git] [Evolveum/midpoint] 7fdb3e: improved check for assignment evaluation order, i...
Katarina Valalikova
k.valalikova at evolveum.com
Tue Sep 6 18:06:19 CEST 2016
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 7fdb3e271bc2686d2bf8d3fbcd0b6767beab2cb2
https://github.com/Evolveum/midpoint/commit/7fdb3e271bc2686d2bf8d3fbcd0b6767beab2cb2
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
Log Message:
-----------
improved check for assignment evaluation order, improving logging, expression variables for 'dynamic' assignments
Commit: e327f143e0cb8a19a31789faa3f64d58aef14b8a
https://github.com/Evolveum/midpoint/commit/e327f143e0cb8a19a31789faa3f64d58aef14b8a
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M .gitignore
M INSTALL
M INSTALL-dist
M NEWS
M README.md
M RELEASE-NOTES
M build-system/pom.xml
M config/initial-objects/040-role-enduser.xml
M gui/admin-gui/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/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageExecuteMapping.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageExecuteMapping.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
A gui/admin-gui/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/mapping-samples/OrgName.map.xml.data
A gui/admin-gui/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/mapping-samples/OrgName.req.xml.data
M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
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_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 icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyOrg.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyPrivilege.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.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/builder/DeltaBuilder.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ItemEntry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelCompareOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.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/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.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/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.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/TestAssignmentEvaluator.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
A model/model-intest/src/test/resources/activation/resource-dummy-coral.xml
M model/model-intest/src/test/resources/common/resource-dummy-emerald-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-emerald.xml
A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.xml
A model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
M provisioning/provisioning-impl/pom.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.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/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
M repo/system-init/src/main/resources/midpoint.info
A samples/resources/ad-ldap/ad-ldap-medusa-exchange.xml
A samples/resources/googleapps/googleapps-resource.xml
M testing/story/pom.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Conflicts:
model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
Commit: 9ee4c83c9f25af9c5519e508e138065fa7e40283
https://github.com/Evolveum/midpoint/commit/9ee4c83c9f25af9c5519e508e138065fa7e40283
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
Log Message:
-----------
fixing tests
Commit: ed74a80c4f3bd88f8ebb5a95d1e48f768315821c
https://github.com/Evolveum/midpoint/commit/ed74a80c4f3bd88f8ebb5a95d1e48f768315821c
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/104ced6a4365...ed74a80c4f3b
More information about the midPoint-svn
mailing list