[midPoint-git] [Evolveum/midpoint] 692104: Merge branch 'master' of https://github.com/Evolve...
Pavol Mederly
mederly at evolveum.com
Tue Nov 29 21:11:04 CET 2016
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 692104a00f20f1daf60eceffc67763fb8f51b832
https://github.com/Evolveum/midpoint/commit/692104a00f20f1daf60eceffc67763fb8f51b832
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-25 (Fri, 25 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.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/TestDiffEquals.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.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/CredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.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/rbac/TestRbac.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/rbac/role-immutable-global.xml
A model/model-intest/src/test/resources/rbac/role-non-createable.xml
A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 7d94578654ce13687e831a62693752e5e9e925f8
https://github.com/Evolveum/midpoint/commit/7d94578654ce13687e831a62693752e5e9e925f8
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-26 (Sat, 26 Nov 2016)
Changed paths:
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
A model/workflow-impl/src/test/resources/policy/metarole-default.xml
A model/workflow-impl/src/test/resources/policy/metarole-security.xml
R model/workflow-impl/src/test/resources/policy/metarole1.xml
A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
M model/workflow-impl/src/test/resources/policy/user-lead1.xml
M model/workflow-impl/src/test/resources/policy/user-lead2.xml
M model/workflow-impl/src/test/resources/policy/user-lead3.xml
A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
M model/workflow-impl/testng-integration.xml
Log Message:
-----------
Testing approval fragments defined via metaroles.
Commit: c46838fb366eb17306e2ccc969a40e65be40a188
https://github.com/Evolveum/midpoint/commit/c46838fb366eb17306e2ccc969a40e65be40a188
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-28 (Mon, 28 Nov 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/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
A infra/schema/src/test/resources/common/xml/ns/metarole.xml
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/EvaluatedPolicyRule.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/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
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
M model/model-impl/src/test/resources/lens/role-corp-manager.xml
M model/model-impl/src/test/resources/lens/role-corp-visitor.xml
M model/workflow-impl/src/test/resources/policy/role-role1b.xml
Log Message:
-----------
Preparation for fixing false triggering of indirect assignments' rules.
Commit: 4a97202de3302d56a6c4c40e45a74f8965d3933e
https://github.com/Evolveum/midpoint/commit/4a97202de3302d56a6c4c40e45a74f8965d3933e
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 55d661774846cc794eeb348c03166530b586d4c7
https://github.com/Evolveum/midpoint/commit/55d661774846cc794eeb348c03166530b586d4c7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths:
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
A 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/EvaluatedPolicyRule.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
A 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/Construction.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/EvaluatedPolicyRuleImpl.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.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/FocusProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
Log Message:
-----------
Interim commit.
Commit: 14bd6346fcdfe2d5c83128866ad8c12c774aa7b3
https://github.com/Evolveum/midpoint/commit/14bd6346fcdfe2d5c83128866ad8c12c774aa7b3
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-28 (Mon, 28 Nov 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/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseMetarole.java
A infra/schema/src/test/resources/common/xml/ns/metarole.xml
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
A 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/EvaluatedPolicyRule.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.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
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
A 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/Construction.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/EvaluatedPolicyRuleImpl.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.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/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/FocusProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
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
M model/model-impl/src/test/resources/lens/role-corp-manager.xml
M model/model-impl/src/test/resources/lens/role-corp-visitor.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/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.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/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ApprovalInstruction.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedTask.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/ExpectedWorkItem.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestAssignmentApprovalGlobal.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/global/TestLifecycleGlobal.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentApprovalMetaroleExplicit.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/metarole/TestAssignmentsWithDifferentMetaroles.java
R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlain.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainExplicit.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
A model/workflow-impl/src/test/resources/policy/metarole-default.xml
A model/workflow-impl/src/test/resources/policy/metarole-security.xml
A model/workflow-impl/src/test/resources/policy/role-role10a.xml
A model/workflow-impl/src/test/resources/policy/role-role10b.xml
M model/workflow-impl/src/test/resources/policy/role-role1a.xml
M model/workflow-impl/src/test/resources/policy/role-role1b.xml
A model/workflow-impl/src/test/resources/policy/role-role21-standard.xml
A model/workflow-impl/src/test/resources/policy/role-role22-special.xml
A model/workflow-impl/src/test/resources/policy/role-role23-special-and-security.xml
M model/workflow-impl/src/test/resources/policy/role-role2a.xml
M model/workflow-impl/src/test/resources/policy/role-role2b.xml
M model/workflow-impl/src/test/resources/policy/role-role3a.xml
M model/workflow-impl/src/test/resources/policy/role-role3b.xml
A model/workflow-impl/src/test/resources/policy/role-role4a.xml
A model/workflow-impl/src/test/resources/policy/role-role4b.xml
M model/workflow-impl/src/test/resources/policy/user-lead1.xml
M model/workflow-impl/src/test/resources/policy/user-lead10.xml
M model/workflow-impl/src/test/resources/policy/user-lead2.xml
M model/workflow-impl/src/test/resources/policy/user-lead3.xml
M model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
A model/workflow-impl/src/test/resources/policy/user-security-approver-deputy.xml
A model/workflow-impl/src/test/resources/policy/user-security-approver.xml
M model/workflow-impl/testng-integration.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
Log Message:
-----------
Merge branch 'master' of x:\midpoint
Commit: c53f1150d85b2df4a58c4838bea0a5fc18eb237d
https://github.com/Evolveum/midpoint/commit/c53f1150d85b2df4a58c4838bea0a5fc18eb237d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
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/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
M repo/repo-sql-impl-test/sql-procedures/mysql.sql
M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
M samples/resources/scim1/Salesforce/role-group-metarole.xml
M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
M samples/resources/scim1/Slack/role-default-slack-account.xml
M samples/resources/scim1/Slack/role-group-metarole.xml
M samples/resources/scim1/Slack/systemconfig-slack.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: b258679f1b3a85481458263fced6c7d36a49b021
https://github.com/Evolveum/midpoint/commit/b258679f1b3a85481458263fced6c7d36a49b021
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 80a4124f6eff1a79eee0ef8cea4c5bff0ae60791
https://github.com/Evolveum/midpoint/commit/80a4124f6eff1a79eee0ef8cea4c5bff0ae60791
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
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/page/admin/reports/dto/AuditSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
A model/model-intest/src/test/resources/rbac/role-immutable-assign.xml
A model/model-intest/src/test/resources/rbac/role-meta-untouchable.xml
A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditResultHandler.java
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
M repo/repo-sql-impl-test/sql-procedures/mysql.sql
M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperationId.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
M samples/resources/scim1/Salesforce/objecttemplate-role-salesforce.xml
M samples/resources/scim1/Salesforce/objecttemplate-user-salesforce.xml
M samples/resources/scim1/Salesforce/resource-salesforce-scim-connector.xml
M samples/resources/scim1/Salesforce/role-default-salesforce-acount.xml
M samples/resources/scim1/Salesforce/role-entitlement-metarole.xml
M samples/resources/scim1/Salesforce/role-group-metarole.xml
M samples/resources/scim1/Salesforce/systemconfig-salesforce.xml
M samples/resources/scim1/Slack/objecttemplate-role-slack.xml
M samples/resources/scim1/Slack/objecttemplate-user-slack.xml
M samples/resources/scim1/Slack/resource-slack-scim-connector.xml
M samples/resources/scim1/Slack/role-default-slack-account.xml
M samples/resources/scim1/Slack/role-group-metarole.xml
M samples/resources/scim1/Slack/systemconfig-slack.xml
Log Message:
-----------
Merge branch 'master' of x:\midpoint
Commit: d03667b017526756e687551023f87bfbdee8ce80
https://github.com/Evolveum/midpoint/commit/d03667b017526756e687551023f87bfbdee8ce80
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-intest/src/test/resources/rbac/role-cannibal.xml
M model/model-intest/src/test/resources/rbac/role-governor.xml
M model/model-intest/src/test/resources/rbac/role-non-assignable.xml
Log Message:
-----------
When collecting policy rules, apply order constraints.
Commit: 8ce165d9ffae791102239a3ed212d52bed6fbe61
https://github.com/Evolveum/midpoint/commit/8ce165d9ffae791102239a3ed212d52bed6fbe61
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
Log Message:
-----------
Differentiating focus vs target policy rules
Commit: 21747082aca894c35e1ceeae8ff937fb8faaf0d7
https://github.com/Evolveum/midpoint/commit/21747082aca894c35e1ceeae8ff937fb8faaf0d7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.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/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/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/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
M model/model-intest/src/test/resources/rbac/role-cannibal.xml
M model/model-intest/src/test/resources/rbac/role-governor.xml
M model/model-intest/src/test/resources/rbac/role-non-assignable.xml
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
Log Message:
-----------
Merge branch 'master' of x:\midpoint
Commit: 68f83eb37d2468a2c16a719709560bc823eca1b5
https://github.com/Evolveum/midpoint/commit/68f83eb37d2468a2c16a719709560bc823eca1b5
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
A model/model-impl/src/test/resources/lens/role-corp-auth.xml
M model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
Log Message:
-----------
Preparation for "induced authorizations" test.
Commit: 362dc694854d5e7592b91426b0d1d2832e2027ac
https://github.com/Evolveum/midpoint/commit/362dc694854d5e7592b91426b0d1d2832e2027ac
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
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/processors/BaseConfigurationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
Log Message:
-----------
Configurable default approval rules
Commit: 3d22caf6c67f2d641b156aaad7ab716c450bc1c9
https://github.com/Evolveum/midpoint/commit/3d22caf6c67f2d641b156aaad7ab716c450bc1c9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
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-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.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/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
M model/model-intest/src/test/resources/rbac/role-cannibal.xml
M model/model-intest/src/test/resources/rbac/role-governor.xml
M model/model-intest/src/test/resources/rbac/role-non-assignable.xml
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
M model/workflow-impl/src/test/resources/policy/metarole-security.xml
M model/workflow-impl/src/test/resources/policy/role-role1b.xml
Log Message:
-----------
Differentiating between "target policy rules" and "this target policy rules".
Commit: e133265f1aafad81be5e7f27a138995a1dcf7872
https://github.com/Evolveum/midpoint/commit/e133265f1aafad81be5e7f27a138995a1dcf7872
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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
Log Message:
-----------
Fixing some tests, e.g. related to processing membership info from induced roles of wrong order.
Commit: a6063c2d66a6f978fb160f3eee08dc7e02b7bb22
https://github.com/Evolveum/midpoint/commit/a6063c2d66a6f978fb160f3eee08dc7e02b7bb22
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
Log Message:
-----------
Fixed handling of legacy assignment-related policy rules.
Commit: e6c31c84e117c4e9a51169261eba603190f5b331
https://github.com/Evolveum/midpoint/commit/e6c31c84e117c4e9a51169261eba603190f5b331
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M build-system/pom.xml
M config/sql/midpoint/3.5/h2/h2-3.5.sql
M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeObjectType.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/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M repo/repo-sql-impl-test/pom.xml
M repo/repo-sql-impl-test/sql-procedures/mysql.sql
M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
M tools/repo-ninja/pom.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: bebd5725096c7821d4e06575c34082075f4e75ee
https://github.com/Evolveum/midpoint/commit/bebd5725096c7821d4e06575c34082075f4e75ee
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
Log Message:
-----------
Disabled obsolete prism test (normalize() on empty PCVs)
Compare: https://github.com/Evolveum/midpoint/compare/0e90d4ab0fb8...bebd5725096c
More information about the midPoint-svn
mailing list