[midPoint-git] [Evolveum/midpoint] a346dd: Assignments conflicts panel, not finished
honchar
honchar at evolveum.com
Sat Feb 18 03:21:42 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: a346dd71e90f7983ecccb0d5f23c4aa6aa30057e
https://github.com/Evolveum/midpoint/commit/a346dd71e90f7983ecccb0d5f23c4aa6aa30057e
Author: honchar <honchar at evolveum.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflict.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Assignments conflicts panel, not finished
Commit: 7e15409cfbfea0a75fc10c13cc681854b7e37d85
https://github.com/Evolveum/midpoint/commit/7e15409cfbfea0a75fc10c13cc681854b7e37d85
Author: honchar <honchar at evolveum.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M build-system/pom.xml
M config/sql/midpoint/3.6/h2/h2-3.6.sql
M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
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/wf/DecisionsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordItemValueDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_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 icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionSupplier.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemDeltaType.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ParamsTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/localization/schema_pl.properties
M infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
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-notifications-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseWorkflowContext.java
M infra/schema/src/test/resources/common/task-1.xml
A infra/schema/src/test/resources/common/xml/ns/wf-context.xml
M infra/schema/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageTriggerHandler.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/OrgStructFunctions.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/SchemaTransformer.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/expr/OrgStructFunctionsImpl.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/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.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/TriggerHandler.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/Utils.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.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/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/TestVolatility.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTriggerHandler.java
M model/model-intest/src/test/resources/common/role-pirate.xml
M model/model-intest/src/test/resources/volatility/resource-dummy-hr.xml
A model/model-intest/src/test/resources/volatility/resource-dummy-monsterized.xml
M model/model-intest/src/test/resources/volatility/resource-dummy-volatile.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyTransport.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/NotificationManager.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
R model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEventCreator.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowProcessEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/transports/Message.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/transports/Transport.java
M model/notifications-impl/pom.xml
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
R model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFuctionsImpl.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFunctionsImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationTaskListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/SimpleObjectRefImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/CustomTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java
R model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/workflow/DefaultWorkflowEventCreator.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountPasswordNotifier.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/CustomNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignStageNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserRegistrationNotifier.java
M model/workflow-api/pom.xml
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/QueryUtils.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/ActivitiEngine.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/ActivitiInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskDeletedEvent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/DumpVariables.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/MidPointTaskListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughLevels.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ReferenceResolver.java
M 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/processes/itemApproval/SummarizeDecisionsInLevel.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCreateListener.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.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/general/scenarios/BaseGcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.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
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/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/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java
M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
M 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/AbstractWfTestPolicy.java
M 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/assignments/plain/TestAssignmentApprovalPlainExplicit.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
A model/workflow-impl/src/test/resources/common/task-trigger-scanner.xml
A model/workflow-impl/src/test/resources/policy/escalation/metarole-escalated.xml
A model/workflow-impl/src/test/resources/policy/escalation/role-e1.xml
M model/workflow-impl/testng-integration.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.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/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
M repo/audit-api/pom.xml
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
A repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditReferenceValue.java
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
M repo/repo-sql-impl-test/testng-integration.xml
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
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItem.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditItemId.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditPropertyValue.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditReferenceValue.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
M samples/demo/PageBase.html
A samples/objects/custom-notifications.xml
M samples/objects/extended-notifications.xml
M testing/story/pom.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M testing/story/src/test/resources/common/system-configuration.xml
M testing/story/src/test/resources/ctx-story-test-main.xml
M testing/story/src/test/resources/logback-test.xml
R testing/story/src/test/resources/strings/roles-2/a-test-1.xml
R testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
R testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
R testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
R testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
R testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
R testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
R testing/story/src/test/resources/strings/roles-2/a-test-4.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
A testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
A testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
A testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
M testing/story/src/test/resources/strings/users/barkeeper.xml
M testing/story/src/test/resources/strings/users/bob.xml
M testing/story/src/test/resources/strings/users/carla.xml
M testing/story/src/test/resources/strings/users/cheese.xml
M testing/story/src/test/resources/strings/users/chef.xml
M testing/story/src/test/resources/strings/users/elaine.xml
M testing/story/src/test/resources/strings/users/guybrush.xml
M testing/story/src/test/resources/strings/users/lechuck.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: dc430c9929cf50345a6f37e9d812bc312e6bc9fa
https://github.com/Evolveum/midpoint/commit/dc430c9929cf50345a6f37e9d812bc312e6bc9fa
Author: honchar <honchar at evolveum.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.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/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.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/TestPreviewChanges.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/common/role-pirate.xml
M model/model-intest/src/test/resources/mapping-inbound/resource-dummy-tea-green.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
M model/workflow-impl/src/test/resources/common/resource-dummy.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.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/ResourceCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 800f5aeaf85c81f14cb38175db7fe42ca0bc8770
https://github.com/Evolveum/midpoint/commit/800f5aeaf85c81f14cb38175db7fe42ca0bc8770
Author: honchar <honchar at evolveum.com>
Date: 2017-02-18 (Sat, 18 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Assignments conflicts panel, not finished
Compare: https://github.com/Evolveum/midpoint/compare/128059f2ed6f...800f5aeaf85c
More information about the midPoint-svn
mailing list