[midPoint-git] [Evolveum/midpoint] d8447d: Password retention (MID-630) in progress.

Pavol Mederly mederly at evolveum.com
Wed Mar 30 15:15:01 CEST 2016


  Branch: refs/heads/feature/new-approval-gui
  Home:   https://github.com/Evolveum/midpoint
  Commit: d8447dc8091087b75665b06805554806f8b0281b
      https://github.com/Evolveum/midpoint/commit/d8447dc8091087b75665b06805554806f8b0281b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/AuthenticationEvaluatorImpl.java

  Log Message:
  -----------
  Password retention (MID-630) in progress.


  Commit: 78c6a87c30df7a6688145527ffe32e1bdcd2448b
      https://github.com/Evolveum/midpoint/commit/78c6a87c30df7a6688145527ffe32e1bdcd2448b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.4/h2/h2-3.4.sql
    M config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql
    M config/sql/midpoint/3.4/mysql/mysql-3.4.sql
    M config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql
    M config/sql/midpoint/3.4/oracle/oracle-3.4.sql
    M config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-3.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql
    A config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-3.sql
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkColumn.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html
    A 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/prism/show/SceneButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLineDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/WrapperScene.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportingAwarePage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFormPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableObjectDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.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/CertDecisionHelper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/MyWorkItemDto.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/PageResources.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountOwnerChangeDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSearchDto.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/PageRoles.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.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
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RolesSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.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/TaskDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProviderOptions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.html
    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.html
    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/ProcessInstancePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.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/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceNewDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.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/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.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/page/self/component/ChangePasswordPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/MyRequestsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/MyRequestsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.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_ItemEntry.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/polystring/PolyString.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedStringType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.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/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-3.xsd
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationEventListener.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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/context/ModelProjectionContext.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/Name.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/Scene.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/SceneDeltaItem.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/SceneItem.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/SceneItemValue.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluatorFactory.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/lens/Construction.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/ConsolidationProcessor.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/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/VisualizationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/NameImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneDeltaItemImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneItemImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneItemValueImpl.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/NotificationManager.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M 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-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M 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/notifiers/SimpleWorkflowNotifier.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/ProcessListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WfTaskExtensionItemsNames.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    R model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConstants.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/ActivitiEngine.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/ActivitiEngineDataHelper.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/ProcessInstanceManager.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/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/users/MidPointUserManager.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobContext.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobController.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfProcessInstanceShadowTaskHandler.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/ActivitiToMidPointMessage.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/MidPointToActivitiMessage.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/ProcessEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/ProcessFinishedEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/ProcessStartedEvent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/QueryProcessCommand.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/QueryProcessResponse.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/StartProcessCommand.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/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessInterfaceFinder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/addrole/AddRoleVariableNames.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/LightweightObjectRef.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRefImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/MidPointProcessListener.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/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/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
    A 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/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M 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/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessorSpecificContent.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/ObjectTreeDeltas.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildJobCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpExternalizationHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpWfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessorSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.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/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.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/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
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/ProcessSpecificContent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/ProcessorSpecificContent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfProcessInstanceShadowTaskHandler.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/ApprovingDummyResourceChangesScenarioBean.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/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/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CertificationTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/LookupTableTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M samples/stories/unix-management/resource-unix-advanced.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapCookedTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapRawTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapMedusa.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapRawLocalhost.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestAdLdapRawMedusa.java
    A testing/conntest/src/test/resources/ad-ldap/resource-raw-localhost.xml
    A testing/conntest/src/test/resources/ad-ldap/resource-raw-medusa.xml
    M testing/conntest/testng-integration.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFlatLdap.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    A testing/story/src/test/resources/flat-ldap/org-top.xml
    A testing/story/src/test/resources/flat-ldap/resource-opendj.xml
    A testing/story/src/test/resources/flat-ldap/role-meta-org.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/password-retention


  Commit: 96ab577e7a04b332ee06170270881651d0a4626f
      https://github.com/Evolveum/midpoint/commit/96ab577e7a04b332ee06170270881651d0a4626f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/RepositoryException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthenticationEvaluator.java
    M repo/security-impl/pom.xml
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/AuthenticationEvaluatorImpl.java
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestAuthenticationEvaluator.java
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java
    A repo/security-impl/src/test/resources/ctx-security-test-main.xml
    A repo/security-impl/src/test/resources/ctx-security-test.xml
    A repo/security-impl/src/test/resources/logback-test.xml
    A repo/security-impl/src/test/resources/security-policy.xml
    A repo/security-impl/src/test/resources/system-configuration.xml
    A repo/security-impl/src/test/resources/user-jack.xml
    M repo/security-impl/testng-integration.xml

  Log Message:
  -----------
  Rudimentary AuhorizationEvaluator and basic test


  Commit: 35fd774bbf274ed5295b6739d075fd000e607044
      https://github.com/Evolveum/midpoint/commit/35fd774bbf274ed5295b6739d075fd000e607044
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/AuthenticationEvaluatorImpl.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestAuthenticationEvaluator.java
    M repo/security-impl/src/test/resources/security-policy.xml
    M repo/security-impl/src/test/resources/user-jack.xml

  Log Message:
  -----------
  Authentication lockout tests and fixes


  Commit: 284774534fdcbbb151306bf97f870c8818a71c5d
      https://github.com/Evolveum/midpoint/commit/284774534fdcbbb151306bf97f870c8818a71c5d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestAuthenticationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    A model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/testng-unit.xml
    R repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthenticationEvaluator.java
    M repo/security-impl/pom.xml
    R repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/AuthenticationEvaluatorImpl.java
    R repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestAuthenticationEvaluator.java
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M repo/security-impl/testng-integration.xml

  Log Message:
  -----------
  Moving AuthenticationEvaluator to model-impl


  Commit: 51867e2b46b82bee7a007d481dda829bc301a8c2
      https://github.com/Evolveum/midpoint/commit/51867e2b46b82bee7a007d481dda829bc301a8c2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFlatLdap.java
    M testing/story/src/test/resources/science/resource-dummy-unix.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/password-retention


  Commit: 404a0a71f391859c1e847e2b643e659cfe08e2a0
      https://github.com/Evolveum/midpoint/commit/404a0a71f391859c1e847e2b643e659cfe08e2a0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestAuthenticationEvaluator.java
    M model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/common/user-guybrush.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Password expiration tests


  Commit: 2f61c5c40dad18d12f90dcc3558f5a1b0bedbebc
      https://github.com/Evolveum/midpoint/commit/2f61c5c40dad18d12f90dcc3558f5a1b0bedbebc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml

  Log Message:
  -----------
  Fixing spring context


  Commit: e15d5731c9d592d5d7ca320cdf9e6c42416fac88
      https://github.com/Evolveum/midpoint/commit/e15d5731c9d592d5d7ca320cdf9e6c42416fac88
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestAuthenticationEvaluator.java

  Log Message:
  -----------
  AdministrativeStatus authentication tests


  Commit: 5fb1f0fa25fece694ca9820344b9bd43f8f132ad
      https://github.com/Evolveum/midpoint/commit/5fb1f0fa25fece694ca9820344b9bd43f8f132ad
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Merge branch 'master' into feature/password-retention


  Commit: 76c0b97ec9767850df9279ec7f7ebb9792b83881
      https://github.com/Evolveum/midpoint/commit/76c0b97ec9767850df9279ec7f7ebb9792b83881
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestAuthenticationEvaluator.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java

  Log Message:
  -----------
  Authentication with validFrom/validTo: test and fixes


  Commit: 59bd62e9294e09e705ebbc07d165234ec4d1f9da
      https://github.com/Evolveum/midpoint/commit/59bd62e9294e09e705ebbc07d165234ec4d1f9da
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.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/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/WsFaultListener.java
    M model/model-impl/src/main/resources/ctx-model.xml
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestAuthenticationEvaluator.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    M model/model-impl/testng-unit.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java

  Log Message:
  -----------
  Reworking REST and WS authentication to use AuthenticationEvaluator, sorting out the exceptions


  Commit: e48c2e66ce8ccbe0463280c3f2693d90f92eb84a
      https://github.com/Evolveum/midpoint/commit/e48c2e66ce8ccbe0463280c3f2693d90f92eb84a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M testing/rest/src/test/resources/logback-test.xml
    M testing/rest/src/test/resources/repo/system-configuration.xml

  Log Message:
  -----------
  Fixing the REST authentication


  Commit: cb37f5307d859a2ecedf4789ac0e91496baa2cdb
      https://github.com/Evolveum/midpoint/commit/cb37f5307d859a2ecedf4789ac0e91496baa2cdb
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java

  Log Message:
  -----------
  MID-2548 searches for user,roles,tasks,resources,debug list are stored in session.


  Commit: 089397e7acd2d59b461a418ac03c88641cd2fe95
      https://github.com/Evolveum/midpoint/commit/089397e7acd2d59b461a418ac03c88641cd2fe95
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js

  Log Message:
  -----------
  MID-2815 advanced search implemented


  Commit: b5811c31341bfbbc89498b252b5cb5f6c0e995dd
      https://github.com/Evolveum/midpoint/commit/b5811c31341bfbbc89498b252b5cb5f6c0e995dd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  resource pages - adding task operations - import, liveSync, recon..


  Commit: 1b8e97219ec3f75909ef9d64234ae3407d86fb40
      https://github.com/Evolveum/midpoint/commit/1b8e97219ec3f75909ef9d64234ae3407d86fb40
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java

  Log Message:
  -----------
  new component - dropdown button


  Commit: b93a478fff3c693de942a0b98de9a6454f08564c
      https://github.com/Evolveum/midpoint/commit/b93a478fff3c693de942a0b98de9a6454f08564c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/RepositoryException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/WsFaultListener.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    A model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/test/resources/common/user-guybrush.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-impl/pom.xml
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java
    A repo/security-impl/src/test/resources/ctx-security-test-main.xml
    A repo/security-impl/src/test/resources/ctx-security-test.xml
    A repo/security-impl/src/test/resources/logback-test.xml
    A repo/security-impl/src/test/resources/security-policy.xml
    A repo/security-impl/src/test/resources/system-configuration.xml
    A repo/security-impl/src/test/resources/user-jack.xml
    M repo/security-impl/testng-integration.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M testing/rest/src/test/resources/logback-test.xml
    M testing/rest/src/test/resources/repo/system-configuration.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFlatLdap.java

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

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: 695238220af4c34879c2869f160ea214eef418fe
      https://github.com/Evolveum/midpoint/commit/695238220af4c34879c2869f160ea214eef418fe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java

  Log Message:
  -----------
  small cleanup + updating license headers


  Commit: 41081cdf7ce0857923edc44d63f592154b9387a1
      https://github.com/Evolveum/midpoint/commit/41081cdf7ce0857923edc44d63f592154b9387a1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.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/dto/ObjectViewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java

  Log Message:
  -----------
  MID-2776 fixed storing debug list page search


  Commit: 6fa1295c41ccbeb152bbf5ee863b4b92a084818c
      https://github.com/Evolveum/midpoint/commit/6fa1295c41ccbeb152bbf5ee863b4b92a084818c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-03-26 (Sat, 26 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java

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


  Commit: 5893399bc47966480f1286b2ff9046f7607839ae
      https://github.com/Evolveum/midpoint/commit/5893399bc47966480f1286b2ff9046f7607839ae
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-27 (Sun, 27 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  small css fixed and small refactoring in resource ocntent panels


  Commit: 9c403a73591f3262bb55ed81c01d953aa2851426
      https://github.com/Evolveum/midpoint/commit/9c403a73591f3262bb55ed81c01d953aa2851426
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-27 (Sun, 27 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.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/dto/ObjectViewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java

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


  Commit: e47382c9203aea037c55d59a70a73f67d0a9643e
      https://github.com/Evolveum/midpoint/commit/e47382c9203aea037c55d59a70a73f67d0a9643e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.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/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java

  Log Message:
  -----------
  resource content tabs improvemens - adding search pannel, adding "others" tab for uncategorized objects, smal css fixes (horizontal scroll bar), adding result to table.


  Commit: 5a3cf140d329b99b82fee6276e6b34445f8d08f4
      https://github.com/Evolveum/midpoint/commit/5a3cf140d329b99b82fee6276e6b34445f8d08f4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    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/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  task panel for resource


  Commit: 7d0ef7da60f0c8c2e70fec97878fe3ca3facc4d9
      https://github.com/Evolveum/midpoint/commit/7d0ef7da60f0c8c2e70fec97878fe3ca3facc4d9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    A model/workflow-impl/src/test/resources/common/security-policy.xml

  Log Message:
  -----------
  Adding missing security policy


  Commit: ace75d67842420b8a5477f73b447188370e87da6
      https://github.com/Evolveum/midpoint/commit/ace75d67842420b8a5477f73b447188370e87da6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java

  Log Message:
  -----------
  Fixing excessive logging in EntitlementConverter


  Commit: 9bde7663771ae62fb8528236a49d2894d32baa41
      https://github.com/Evolveum/midpoint/commit/9bde7663771ae62fb8528236a49d2894d32baa41
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  new popup for selecting roles/resources/org in one step..


  Commit: 890a426a52a00d5dffc26c25cbae0b286c67b3b5
      https://github.com/Evolveum/midpoint/commit/890a426a52a00d5dffc26c25cbae0b286c67b3b5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    A model/workflow-impl/src/test/resources/common/security-policy.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java

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


  Commit: dd96376a27a93bcfc0418409b15c047309c7f535
      https://github.com/Evolveum/midpoint/commit/dd96376a27a93bcfc0418409b15c047309c7f535
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    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/objectdetails/AbstractFocusTabPanel.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/BaseFocusPanel.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/FocusDetailsTabPanel.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/FocusProjectionsTabPanel.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/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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/configuration/dto/LoggingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusProjectionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  More proper generics in GUI, loadOptions in objet wrapper (MID-2350 in progress)


  Commit: 56ea3c0cc3a50054c7a832ae1b539d05018c1de6
      https://github.com/Evolveum/midpoint/commit/56ea3c0cc3a50054c7a832ae1b539d05018c1de6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


  Commit: dcb06f4dbd48c78cc559c723b4bf3c53998388f8
      https://github.com/Evolveum/midpoint/commit/dcb06f4dbd48c78cc559c723b4bf3c53998388f8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    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/objectdetails/AbstractObjectTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java

  Log Message:
  -----------
  Basic implementation of projection on-deman loading (MID-2350)


  Commit: d8543045aaf8001524f2ff3559ee63ac1a39982d
      https://github.com/Evolveum/midpoint/commit/d8543045aaf8001524f2ff3559ee63ac1a39982d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.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/SchemaToDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Basic implementation of "emphasized" flag in prism (MID-2805)


  Commit: f1f519f19b7d2c6d6a52cd6311070b1dc35e6777
      https://github.com/Evolveum/midpoint/commit/f1f519f19b7d2c6d6a52cd6311070b1dc35e6777
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Override of "emphasized" flag in object template.


  Commit: e5d25b246aa077020cfe702c0d0e4a363285c4e7
      https://github.com/Evolveum/midpoint/commit/e5d25b246aa077020cfe702c0d0e4a363285c4e7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Interim commit before merge.


  Commit: d44622fcfd5b943a1c6ec9b6ee415d7061439f94
      https://github.com/Evolveum/midpoint/commit/d44622fcfd5b943a1c6ec9b6ee415d7061439f94
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractFocusTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectTabPanel.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/BaseFocusPanel.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/FocusDetailsTabPanel.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/FocusProjectionsTabPanel.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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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/configuration/PageDebugList.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/dto/LoggingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    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/PageResources.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.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/PageUsers.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusProjectionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.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/SchemaToDomProcessor.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/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.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
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/RepositoryException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/WsFaultListener.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
    A model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/test/resources/common/user-guybrush.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A model/workflow-impl/src/test/resources/common/security-policy.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-impl/pom.xml
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java
    A repo/security-impl/src/test/resources/ctx-security-test-main.xml
    A repo/security-impl/src/test/resources/ctx-security-test.xml
    A repo/security-impl/src/test/resources/logback-test.xml
    A repo/security-impl/src/test/resources/security-policy.xml
    A repo/security-impl/src/test/resources/system-configuration.xml
    A repo/security-impl/src/test/resources/user-jack.xml
    M repo/security-impl/testng-integration.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M testing/rest/src/test/resources/logback-test.xml
    M testing/rest/src/test/resources/repo/system-configuration.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/new-approval-gui

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: ea0f6ce3c2eb547060b69b36b56aa3859a5b443f
      https://github.com/Evolveum/midpoint/commit/ea0f6ce3c2eb547060b69b36b56aa3859a5b443f
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
    M samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy

  Log Message:
  -----------
  read also no default image as byte[]


  Commit: 7ca26145046622159ef87838f8dbdb371843ab15
      https://github.com/Evolveum/midpoint/commit/7ca26145046622159ef87838f8dbdb371843ab15
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy
    M samples/resources/scriptedrest/jira/SchemaScript.groovy
    M samples/resources/scriptedrest/jira/SearchScript.groovy

  Log Message:
  -----------
  read also no default image as byte[] for jira


  Commit: 9fda82bdb91653d358b3169f95618ef8d4c1fd95
      https://github.com/Evolveum/midpoint/commit/9fda82bdb91653d358b3169f95618ef8d4c1fd95
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
    M samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy
    M samples/resources/scriptedrest/jira/SchemaScript.groovy
    M samples/resources/scriptedrest/jira/SearchScript.groovy

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/new-approval-gui


  Commit: 1a5e6ce9749264e6e0266b41dd71b616bff3e778
      https://github.com/Evolveum/midpoint/commit/1a5e6ce9749264e6e0266b41dd71b616bff3e778
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.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/WorkItemsTablePanel.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/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDto.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/workflowInformation/WorkflowInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.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/ProcessInstancePanel.java
    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/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceNewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsUtil.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/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java

  Log Message:
  -----------
  New tabs on Task page: Subtasks, Progress, States/Actions, Performance, Approvals, Operation context, Result.


Compare: https://github.com/Evolveum/midpoint/compare/ca7cb17c315c...1a5e6ce97492


More information about the midPoint-svn mailing list