[midPoint-git] [Evolveum/midpoint] 01bdd2: MID-4100 fix
kate
honchar at evolveum.com
Mon Aug 7 15:55:21 CEST 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 01bdd2c4e66d70d7f0d132c6a71c8ad47543125a
https://github.com/Evolveum/midpoint/commit/01bdd2c4e66d70d7f0d132c6a71c8ad47543125a
Author: kate <honchar at evolveum.com>
Date: 2017-08-07 (Mon, 07 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageImportResource.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
MID-4100 fix
Commit: 7ff52b2f503f1c7fd878dc4ed618804cd3bde8f2
https://github.com/Evolveum/midpoint/commit/7ff52b2f503f1c7fd878dc4ed618804cd3bde8f2
Author: kate <honchar at evolveum.com>
Date: 2017-08-07 (Mon, 07 Aug 2017)
Changed paths:
M build-system/pom.xml
R cli/common/maven/maven-wrapper.jar
R cli/common/maven/maven-wrapper.properties
R cli/common/mvnw
R cli/common/mvnw.bat
R cli/common/pom.xml
R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
R cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
R cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
R cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
R cli/common/testng-integration.xml
R cli/common/testng-unit.xml
R cli/maven/maven-wrapper.jar
R cli/maven/maven-wrapper.properties
R cli/mvnw
R cli/mvnw.bat
R cli/ninja/README.MD
R cli/ninja/maven/maven-wrapper.jar
R cli/ninja/maven/maven-wrapper.properties
R cli/ninja/mvnw
R cli/ninja/mvnw.bat
R cli/ninja/pom.xml
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
R cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
R cli/ninja/src/main/resources/describe.properties
R cli/ninja/src/main/resources/logback-ninja.xml
R cli/ninja/src/main/resources/logback.xml
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
R cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
R cli/ninja/src/test/resources/logback-test.xml
R cli/ninja/src/test/resources/user.xml
R cli/ninja/testng-integration.xml
R cli/ninja/testng-unit.xml
R cli/pom.xml
R cli/seppuku/README.MD
R cli/seppuku/maven/maven-wrapper.jar
R cli/seppuku/maven/maven-wrapper.properties
R cli/seppuku/mvnw
R cli/seppuku/mvnw.bat
R cli/seppuku/pom.xml
R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
R cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
R cli/seppuku/src/main/resources/ctx-main.xml
R cli/seppuku/src/main/resources/describe.properties
R cli/seppuku/src/main/resources/logback-seppuku.xml
R cli/seppuku/src/main/resources/logback.xml
R cli/seppuku/src/test/resources/logback-test.xml
R cli/seppuku/testng-integration.xml
R cli/seppuku/testng-unit.xml
R cli/testng-integration.xml
R cli/testng-unit.xml
A config/sql/_all/h2-upgrade-3.6-3.7.sql
A config/sql/_all/mysql-upgrade-3.6-3.7.sql
A config/sql/_all/oracle-upgrade-3.6-3.7.sql
A config/sql/_all/postgresql-upgrade-3.6-3.7.sql
A config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
M config/sql/quartz/tables_h2.sql
M config/sql/quartz/tables_mysql.sql
M config/sql/quartz/tables_mysql_innodb.sql
M config/sql/quartz/tables_oracle.sql
M config/sql/quartz/tables_postgres.sql
M config/sql/quartz/tables_sqlServer.sql
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.html
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/ModelServiceLocator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/FlexibleLabelModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.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.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessesPreviewPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.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/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDefinitionSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
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/server/dto/ApprovalOutcomeIcon.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskEditableState.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.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/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
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApproverEngagementDto.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/page/self/component/ChangePasswordPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
M gui/admin-gui/src/main/resources/localization/Midpoint.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_et.properties
A gui/admin-gui/src/main/resources/localization/Midpoint_fi.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 gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
M gui/admin-gui/src/main/resources/localization/locale.properties
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
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 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/RefinedObjectClassDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/QueryType.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.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/MiscSchemaUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.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/PolicyRuleTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/localization/schema_de.properties
A infra/schema/src/main/resources/localization/schema_fi.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-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/resource/capabilities-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/ModelInteractionServiceImpl.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/hooks/PolicyRuleEnforcerHook.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/ActivationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/PipelineData.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/BaseActionExecutor.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/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/helpers/OperationsHelper.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-intest/pom.xml
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/manual/AbstractManualResourceTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManual.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-one-semi-manual-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-two-manual.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual-slow-proposed.xml
A model/model-intest/src/test/resources/manual/role-two-semi-manual.xml
M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
M model/model-intest/testng-integration.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/api/transports/CustomTransport.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/FileTransport.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/api/transports/TransportUtil.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceProvider.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/WfStageComputeHelper.java
M 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/InitializeLoopThroughApproversInStage.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
M 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/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/ProcessSpecificContent.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/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
A model/workflow-impl/src/test/resources/policy/assignments/org-leads2122.xml
A model/workflow-impl/src/test/resources/policy/assignments/role-role25-very-complex-approval.xml
M model/workflow-impl/src/test/resources/policy/assignments/user-lead21.xml
M model/workflow-impl/src/test/resources/policy/assignments/user-lead22.xml
M model/workflow-impl/src/test/resources/policy/assignments/user-lead23.xml
M model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml
M pom.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/ConstraintsChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
M repo/system-init/pom.xml
M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImplUtil.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_h2.sql
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql.sql
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_mysql_innodb.sql
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_oracle.sql
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_postgres.sql
M repo/task-quartz-impl/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql
A samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
# Conflicts:
# gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 4da651068ab7b480d18e2864219c7a3c97faf50e
https://github.com/Evolveum/midpoint/commit/4da651068ab7b480d18e2864219c7a3c97faf50e
Author: kate <honchar at evolveum.com>
Date: 2017-08-07 (Mon, 07 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
missing property is added
Compare: https://github.com/Evolveum/midpoint/compare/799cdb792f90...4da651068ab7
More information about the midPoint-svn
mailing list