[midPoint-git] [Evolveum/midpoint] f609f2: MID-3559 fixed (Shopping cart: catalog: does not r...
Petr Gašparík
petr.gasparik at ami.cz
Thu Dec 8 16:19:08 CET 2016
Branch: refs/heads/transifex
Home: https://github.com/Evolveum/midpoint
Commit: f609f259e2b74bf8266862babac0ed802ed7c2ba
https://github.com/Evolveum/midpoint/commit/f609f259e2b74bf8266862babac0ed802ed7c2ba
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.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/RoleCatalogStorage.java
Log Message:
-----------
MID-3559 fixed (Shopping cart: catalog: does not return to category)
Commit: eab1d55a328d8c00d4ebbf70ff78b82b392b7024
https://github.com/Evolveum/midpoint/commit/eab1d55a328d8c00d4ebbf70ff78b82b392b7024
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.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/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/SceneItemValue.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneItemValueImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.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/ApprovalSchemaImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/PropertyRestriction.java
A samples/tasks/limiting-parallel-execution-2.xml
A samples/tasks/limiting-parallel-execution.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 9904f7f240f5681705e1a0f06665359e21ce7c0b
https://github.com/Evolveum/midpoint/commit/9904f7f240f5681705e1a0f06665359e21ce7c0b
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
Log Message:
-----------
MID-3416 fixed (Cancel button does not close the object policies dialog window)
Commit: 270169b53835b5e93a32aadcc422b10ea3d55cd7
https://github.com/Evolveum/midpoint/commit/270169b53835b5e93a32aadcc422b10ea3d55cd7
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Fixing approval and owner relations (MID-3580)
Commit: ea7e35e486a41f176e915fd8c19b2c9e908b2a4b
https://github.com/Evolveum/midpoint/commit/ea7e35e486a41f176e915fd8c19b2c9e908b2a4b
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ProfilingDto.java
Log Message:
-----------
MID-3431 fixed (Saving changes in Configuration/Profiling configuration will disable profiling)
Commit: 899ae12904a44dbfb53a2871b7b43af52d0855b5
https://github.com/Evolveum/midpoint/commit/899ae12904a44dbfb53a2871b7b43af52d0855b5
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/DeputyUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 1303e385bc89eac092aeb7547fa7afdb4f49c154
https://github.com/Evolveum/midpoint/commit/1303e385bc89eac092aeb7547fa7afdb4f49c154
Author: honchar <honchar at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.properties
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Log Message:
-----------
little fix for properties
Commit: 05626e41be76d117cd39f475baf6646aa8241334
https://github.com/Evolveum/midpoint/commit/05626e41be76d117cd39f475baf6646aa8241334
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
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/progress/ProgressReporter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.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/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/CertificationHandler.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AccessCertificationService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
R model/model-api/src/main/java/com/evolveum/midpoint/model/api/PolicyViolationException.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/expr/MidpointFunctions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ResourceUtils.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/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/DependencyProcessor.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/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.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/scripting/helpers/OperationsHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/controller/ControllerAddObjectTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
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/TestPassword.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/TestResources.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.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/negative/TestAssignmentErrors.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/rbac/TestRbac.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.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/legacy/TestUserChangeApprovalLegacy.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractLdapHierarchyTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDeeplyHierarchical.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapFlat.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapHierarchical.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestRetirement.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUuid.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
Log Message:
-----------
Fixing projector error handling (MID-3569, MID-3564). Moving policy violation exception to util.
Commit: a0a2c6664f108e010f0110a3b258b07d6b82c3d1
https://github.com/Evolveum/midpoint/commit/a0a2c6664f108e010f0110a3b258b07d6b82c3d1
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
Log Message:
-----------
Fixing previous fix (MID-3564)
Commit: 34cfa1e378f78f95d45fe50a19690fa360353c9c
https://github.com/Evolveum/midpoint/commit/34cfa1e378f78f95d45fe50a19690fa360353c9c
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
A infra/util/src/main/java/com/evolveum/midpoint/util/HeteroComparator.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.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/AssignmentProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Fixing membership references with non-membership relations.
Commit: adca42639311981a8a485903b625c733a629d138
https://github.com/Evolveum/midpoint/commit/adca42639311981a8a485903b625c733a629d138
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
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/ApprovalSchemaImpl.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.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/AddResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.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/assignments/ModifyResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.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/test/resources/policy/metarole-security.xml
M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
Log Message:
-----------
Fixed MID-3576: Fix approver relation handling within approver schema
Commit: ec1acc34bee2e1d5684a750c1269ae9805453bc4
https://github.com/Evolveum/midpoint/commit/ec1acc34bee2e1d5684a750c1269ae9805453bc4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
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/ApprovalSchemaImpl.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.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/AddResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.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/assignments/ModifyResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.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/test/resources/policy/metarole-security.xml
M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
Log Message:
-----------
Merge branch 'master' of x:/midpoint
Commit: f688df7a34924c8efb54a9dea3e9e76f53c35098
https://github.com/Evolveum/midpoint/commit/f688df7a34924c8efb54a9dea3e9e76f53c35098
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
Log Message:
-----------
Fixing audit asserts in REST tests
Commit: 91c2ea2fbe092895c8a80117425f21eb55cb1193
https://github.com/Evolveum/midpoint/commit/91c2ea2fbe092895c8a80117425f21eb55cb1193
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
Log Message:
-----------
Fixed importing "<objects>" without a namespace.
Commit: 28eb7337495aa6a916ff3a6a817d680f7171300f
https://github.com/Evolveum/midpoint/commit/28eb7337495aa6a916ff3a6a817d680f7171300f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
Log Message:
-----------
Fixed MID-3583 for suspension of reconcile task: show not only last error in task for reconcile/recompute but at least 30 with name & error message
Commit: b9bcb24d38d686df932854650e62db4ece03b36b
https://github.com/Evolveum/midpoint/commit/b9bcb24d38d686df932854650e62db4ece03b36b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: bf9b401757fc09ef25c4da876776bab96c99bb84
https://github.com/Evolveum/midpoint/commit/bf9b401757fc09ef25c4da876776bab96c99bb84
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
Log Message:
-----------
Fixing OpenLDAP conntests (hopehully)
Commit: f5d41fb33bc8c33f46306d316919684e28137022
https://github.com/Evolveum/midpoint/commit/f5d41fb33bc8c33f46306d316919684e28137022
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebXmlUtil.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
Log Message:
-----------
Fixed MID-3586: RW: it's not possible to update correlation filter clause
Commit: 95a5a8ffdb20ba9d26fa087ed07369b9f76d4be8
https://github.com/Evolveum/midpoint/commit/95a5a8ffdb20ba9d26fa087ed07369b9f76d4be8
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 7646345c6b6d9dafe0bb49c712524e6c96c6a1cf
https://github.com/Evolveum/midpoint/commit/7646345c6b6d9dafe0bb49c712524e6c96c6a1cf
Author: honchar <honchar at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/AuditLogStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
Log Message:
-----------
session storage for audit logs panel
Commit: e542e09954f380a2104d2e77d795ca12de47f727
https://github.com/Evolveum/midpoint/commit/e542e09954f380a2104d2e77d795ca12de47f727
Author: honchar <honchar at evolveum.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
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/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.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/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebXmlUtil.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/util/src/main/java/com/evolveum/midpoint/util/HeteroComparator.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
A infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/CertificationHandler.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AccessCertificationService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
R model/model-api/src/main/java/com/evolveum/midpoint/model/api/PolicyViolationException.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/expr/MidpointFunctions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/ResourceUtils.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/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/DependencyProcessor.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/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.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/scripting/helpers/OperationsHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/controller/ControllerAddObjectTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.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/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
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/TestPassword.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/TestResources.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.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/negative/TestAssignmentErrors.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/rbac/TestRbac.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
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/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/ApprovalSchemaImpl.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.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/AddResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.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/assignments/ModifyResourceAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.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/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.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/legacy/TestUserChangeApprovalLegacy.java
M model/workflow-impl/src/test/resources/policy/metarole-security.xml
M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractLdapHierarchyTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDeeplyHierarchical.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapFlat.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapHierarchical.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestRetirement.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUuid.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 0d3fb46e6788cd30b84a1deaaf29675dd80027e3
https://github.com/Evolveum/midpoint/commit/0d3fb46e6788cd30b84a1deaaf29675dd80027e3
Author: Petr Gašparík <petr.gasparik at ami.cz>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
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_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
Log Message:
-----------
Merge branch 'transifex'
Commit: dd37b5fc7cf2538b02bbacd4206af737a7cb705f
https://github.com/Evolveum/midpoint/commit/dd37b5fc7cf2538b02bbacd4206af737a7cb705f
Author: Petr Gašparík <petr.gasparik at ami.cz>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Log Message:
-----------
fix
Compare: https://github.com/Evolveum/midpoint/compare/0254eaead12f...dd37b5fc7cf2
More information about the midPoint-svn
mailing list