[midPoint-git] [Evolveum/midpoint] 3acdaa: simple get operation perf test

Petr Gašparík petr at gasparik.cz
Mon Aug 14 10:49:31 CEST 2017 

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3acdaac9c0f7814d2ef729c64f236cb255775e4b
      https://github.com/Evolveum/midpoint/commit/3acdaac9c0f7814d2ef729c64f236cb255775e4b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-05 (Sat, 05 Aug 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java

  Log Message:
  -----------
  simple get operation perf test


  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


  Commit: 0296f89c25a37c2d13154708cda599bc98b3fb52
      https://github.com/Evolveum/midpoint/commit/0296f89c25a37c2d13154708cda599bc98b3fb52
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/src/test/resources/lens/user-drake.xml
    M model/model-impl/testng-unit.xml

  Log Message:
  -----------
  Fixed MID-4111: WF Delegation does not take from-to validity into consideration


  Commit: 9bf8a1330e9780672576793dd99cf3309e44f04f
      https://github.com/Evolveum/midpoint/commit/9bf8a1330e9780672576793dd99cf3309e44f04f
  Author: Pavol Mederly <mederly 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
    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
    M 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 infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    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-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
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
    M model/model-intest/src/test/resources/logback-test.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-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 2e3525b89a9b0e3a3c93372abea04624a1445418
      https://github.com/Evolveum/midpoint/commit/2e3525b89a9b0e3a3c93372abea04624a1445418
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java

  Log Message:
  -----------
  MID-3639: preparatory work (DataLanguagePanel)


  Commit: c4f2362d3361fd4fea882cb97673a9fd022e33d7
      https://github.com/Evolveum/midpoint/commit/c4f2362d3361fd4fea882cb97673a9fd022e33d7
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.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/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java

  Log Message:
  -----------
  possible fix for MID-4102


  Commit: 6ee489f112ca0ddbbcd3e02be6bb0335eac94ff5
      https://github.com/Evolveum/midpoint/commit/6ee489f112ca0ddbbcd3e02be6bb0335eac94ff5
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestUserProfileService.java
    M model/model-impl/src/test/resources/lens/user-drake.xml
    M model/model-impl/testng-unit.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java

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


  Commit: 418f5a4ae3ce7c983f7d2b6927066232de1dd6e5
      https://github.com/Evolveum/midpoint/commit/418f5a4ae3ce7c983f7d2b6927066232de1dd6e5
  Author: kate <honchar at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java

  Log Message:
  -----------
  MID-4086 fix


  Commit: b30503ea7953a15d5d6591b3141d646fc2965f7c
      https://github.com/Evolveum/midpoint/commit/b30503ea7953a15d5d6591b3141d646fc2965f7c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.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/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerDomTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerXNodeTarget.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractContainerValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPrismValueParserTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractPropertyValueParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
    A infra/schema/src/test/resources/common/json/no-ns/objects.json
    A infra/schema/src/test/resources/common/json/ns/objects.json
    A infra/schema/src/test/resources/common/xml/no-ns/objects.xml
    A infra/schema/src/test/resources/common/xml/ns/objects.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/objects.yaml
    A infra/schema/src/test/resources/common/yaml/ns/objects.yaml
    M infra/schema/testng-unit.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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/importer/ObjectImporter.java
    A samples/certification/def-all-user-assignments.yaml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java

  Log Message:
  -----------
  MID-3639: first crude implementation


  Commit: cc588514a2ac7f909f650f3ae8f3ff6f84a1e526
      https://github.com/Evolveum/midpoint/commit/cc588514a2ac7f909f650f3ae8f3ff6f84a1e526
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.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/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
    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/self/PageAssignmentsList.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 036d44c343032070018fc2abf2fb08b164ebaf09
      https://github.com/Evolveum/midpoint/commit/036d44c343032070018fc2abf2fb08b164ebaf09
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-after-const.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/FailableFunction.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java

  Log Message:
  -----------
  Fixing strange almost non-reproducible NPE when parsing values with expression.


  Commit: 1f3048bd95a79f89e044427a77d1ac4fee75f4ae
      https://github.com/Evolveum/midpoint/commit/1f3048bd95a79f89e044427a77d1ac4fee75f4ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParserNoIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplIO.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImplNoIO.java

  Log Message:
  -----------
  MID-3639: started work on iterative parsing of JSON/YAML files


  Commit: 31cb73abc9fdbaf14d555d39d32133376e3e8d3a
      https://github.com/Evolveum/midpoint/commit/31cb73abc9fdbaf14d555d39d32133376e3e8d3a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-after-const.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/FailableFunction.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 4b8a2eb8c1e900fa45ad6d31ef4e5c02ca70b90b
      https://github.com/Evolveum/midpoint/commit/4b8a2eb8c1e900fa45ad6d31ef4e5c02ca70b90b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    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/orgstruct/TestOrgStruct.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacLightInitialProjection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacNoInbounds.java
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Attempt to reproduce MID-4110 in tests (not yet successful)


  Commit: f6bf0dccc574f68df86b316e70f0850de4d01ab0
      https://github.com/Evolveum/midpoint/commit/f6bf0dccc574f68df86b316e70f0850de4d01ab0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.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/security/AbstractSecurityTest.java
    A model/model-intest/src/test/resources/common/role-strong-sailor.xml
    M model/model-intest/src/test/resources/rbac/role-weak-singer.xml

  Log Message:
  -----------
  Even more tests for MID-4110


  Commit: ca7f079a459176bc2c247202ff69235998e998b3
      https://github.com/Evolveum/midpoint/commit/ca7f079a459176bc2c247202ff69235998e998b3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Possible fix for MID-4110 (+more tests)


  Commit: 7769d4849bfd10d1001ee68bf4ba625f3d9de2db
      https://github.com/Evolveum/midpoint/commit/7769d4849bfd10d1001ee68bf4ba625f3d9de2db
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java

  Log Message:
  -----------
  Fixing role count in tests


  Commit: b6292b57ff92f027c50c6ed7f1c37f50919c60aa
      https://github.com/Evolveum/midpoint/commit/b6292b57ff92f027c50c6ed7f1c37f50919c60aa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.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/OperationalDataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Recompute updates assignment effectiveStatus (MID-4114)


  Commit: 78e9fa99e64c42bed84ef5218c3010b43e632915
      https://github.com/Evolveum/midpoint/commit/78e9fa99e64c42bed84ef5218c3010b43e632915
  Author: Jan Melník <jan.melnik at email.cz>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Logging: Prudent RollingFileAppender support (remote & shared files) (#41)

* Logging: Prudent RollingFileAppender support (remote & shared files)

* (formatting typo)


  Commit: f339c7538e2a3bc39ca1638aaa65d5d96e8f4582
      https://github.com/Evolveum/midpoint/commit/f339c7538e2a3bc39ca1638aaa65d5d96e8f4582
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

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

  Log Message:
  -----------
  Translation, WIP


Compare: https://github.com/Evolveum/midpoint/compare/799cdb792f90...f339c7538e2a

More information about the midPoint-svn mailing list