[midPoint-git] [Evolveum/midpoint] 8c32ed: resource page - account, entitlement, generic tabs

Katarina Valalikova k.valalikova at evolveum.com
Mon Mar 21 21:01:14 CET 2016


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8c32edb6697cdf8e1d63cdb730ca63b55df5b6f0
      https://github.com/Evolveum/midpoint/commit/8c32edb6697cdf8e1d63cdb730ca63b55df5b6f0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.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/page/admin/resources/PageResource.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/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java

  Log Message:
  -----------
  resource page - account, entitlement, generic tabs


  Commit: 6be5282d9ac0621a5d18fb33fa9e0a357e4ccf6f
      https://github.com/Evolveum/midpoint/commit/6be5282d9ac0621a5d18fb33fa9e0a357e4ccf6f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    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/dto/DebugSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.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/RefinedObjectClassDefinition.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.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/AssignmentEvaluator.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/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ShadowConstraintsChecker.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/resources/strange/role-bad-construction-resource-ref.xml
    A model/model-intest/src/test/resources/strange/role-meta-bad-construction-resource-ref.xml
    A model/model-intest/src/test/resources/strange/role-target-bad-construction-resource-ref.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    M samples/resources/openldap/openldap-localhost-advanced-sync-modifytimestamp.xml
    M samples/resources/openldap/openldap-localhost-medium.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/src/test/resources/openldap/resource.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

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


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

  Changed paths:
    M samples/stories/unix-management/resource-unix-advanced.xml

  Log Message:
  -----------
  fixing resource unix sample - unix management story


  Commit: 98788a1b545c6a476ea672eb0adf3fcf6a194524
      https://github.com/Evolveum/midpoint/commit/98788a1b545c6a476ea672eb0adf3fcf6a194524
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-03-21 (Mon, 21 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
    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/data/BaseSortableDataProvider.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/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/prism/ObjectWrapper.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/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/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
    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/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
    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/PageResources.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.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
    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
    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/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/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-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/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/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 testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java

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

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


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

  Changed paths:
    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/LinkColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/FocusBrowserDialogPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/FocusBrowserDialogPanel.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/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/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
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java

  Log Message:
  -----------
  implementing some actions for resource content..


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLineDto.java
    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
    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 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/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
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java

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


Compare: https://github.com/Evolveum/midpoint/compare/28027758ef65...508af9a53411


More information about the midPoint-svn mailing list