[midPoint-git] [Evolveum/midpoint] 516805: reindex task handler.. added new indexed column - ...

Katarina Valalikova k.valalikova at evolveum.com
Mon Nov 28 17:53:08 CET 2016


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 516805361a9fdc7cf4ddc5903f2084d65886a0bc
      https://github.com/Evolveum/midpoint/commit/516805361a9fdc7cf4ddc5903f2084d65886a0bc
  Author: Katarina Valalikova <k.valalikova 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
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AuditReindexTaskHandler.java
    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/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

  Log Message:
  -----------
  reindex task handler.. added new indexed column - itemPath for deltas..


  Commit: 4d5ffa14b5c55fb4a079aa3f65275d6a7af3d6d1
      https://github.com/Evolveum/midpoint/commit/4d5ffa14b5c55fb4a079aa3f65275d6a7af3d6d1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M build-system/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/assignment/AssignmentCatalogPanel.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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.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/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/workflow/dto/WorkItemDtoProvider.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_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 gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/pom.xml
    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/PrismReferenceValue.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/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.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 infra/schema/src/main/resources/localization/schema_tr.properties
    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/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/user-bill.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuditService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.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/hooks/ChangeHook.java
    A 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/controller/AuditController.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/SystemConfigurationHandler.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/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/EvaluatedAssignmentImpl.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/EvaluationOrder.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-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.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/TestPasswordPolicyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockClockworkHook.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.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/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.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/TestSecurity.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.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/sync/AbstractObjTemplateSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.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-auditor.xml
    A model/model-intest/src/test/resources/security/role-prop-deny-modify-some.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-api/pom.xml
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
    M model/workflow-impl/pom.xml
    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/activiti/dao/WorkItemProvider.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/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.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/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    A 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/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.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/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.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/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.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/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.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/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
    A 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/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/plain/TestAssignmentApprovalPlainExplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApprovalPlainImplicit.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestLifecyclePlain.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/041-role-approver.xml
    A model/workflow-impl/src/test/resources/policy/metarole1.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-role10.xml
    A model/workflow-impl/src/test/resources/policy/role-role10a.xml
    A model/workflow-impl/src/test/resources/policy/role-role10b.xml
    A model/workflow-impl/src/test/resources/policy/role-role1a.xml
    A model/workflow-impl/src/test/resources/policy/role-role1b.xml
    A model/workflow-impl/src/test/resources/policy/role-role2.xml
    A model/workflow-impl/src/test/resources/policy/role-role2a.xml
    A model/workflow-impl/src/test/resources/policy/role-role2b.xml
    A model/workflow-impl/src/test/resources/policy/role-role3.xml
    A model/workflow-impl/src/test/resources/policy/role-role3a.xml
    A model/workflow-impl/src/test/resources/policy/role-role3b.xml
    A model/workflow-impl/src/test/resources/policy/role-role4.xml
    A model/workflow-impl/src/test/resources/policy/role-role4a.xml
    A model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1-deputy2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    A model/workflow-impl/src/test/resources/policy/user-lead10.xml
    A model/workflow-impl/src/test/resources/policy/user-lead2.xml
    A model/workflow-impl/src/test/resources/policy/user-lead3.xml
    A model/workflow-impl/src/test/resources/policy/user-pirate-owner.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.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 provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.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-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.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
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.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
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.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/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java


  Commit: d8a59808150daf504e94ca6997faf0e833fa5985
      https://github.com/Evolveum/midpoint/commit/d8a59808150daf504e94ca6997faf0e833fa5985
  Author: Katarina Valalikova <k.valalikova 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/dto/AuditEventRecordProvider.java

  Log Message:
  -----------
  audit event record provder after merge


  Commit: 57f3559948ecc8a71c43337c88df8a28f4492da6
      https://github.com/Evolveum/midpoint/commit/57f3559948ecc8a71c43337c88df8a28f4492da6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java

  Log Message:
  -----------
  fixing ID for audit item..


  Commit: 321b2a9dc92b362ea565670a24c347ae7aea1c5f
      https://github.com/Evolveum/midpoint/commit/321b2a9dc92b362ea565670a24c347ae7aea1c5f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    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
    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

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/04fc1d4efab7...321b2a9dc92b


More information about the midPoint-svn mailing list