[midPoint-git] [Evolveum/midpoint] 1d0eff: MID-2862 Lock-out status should not be set to Lock...

honchar honchar at evolveum.com
Thu Apr 14 11:41:26 CEST 2016 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1d0eff1a7d5b60feeb5be99a0c95965daa68b166
      https://github.com/Evolveum/midpoint/commit/1d0eff1a7d5b60feeb5be99a0c95965daa68b166
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties

  Log Message:
  -----------
  MID-2862 Lock-out status should not be set to Locked


  Commit: aab3876deb94e0e950bf02e0ca5e91788e7fa202
      https://github.com/Evolveum/midpoint/commit/aab3876deb94e0e950bf02e0ca5e91788e7fa202
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/.gitignore
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.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/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/SecurityContextAwareCallable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/BreadcrumbItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.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/ResourceSummaryPanel.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/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.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/services/PageServices.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    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/users/component/OrgSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.html
    R 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/WorkflowRequestsPanel.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/resource/img/ImgResources.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/wro.xml
    R gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css
    R gui/admin-gui/src/main/webapp/css/admin-lte/fonts.css
    R gui/admin-gui/src/main/webapp/css/css-fixed-IE.css
    R gui/admin-gui/src/main/webapp/css/css-fixed-nonIE.css
    R gui/admin-gui/src/main/webapp/css/evolveum.css
    A gui/admin-gui/src/main/webapp/css/fonts.css
    R gui/admin-gui/src/main/webapp/img/medal_gold_1.png
    R gui/admin-gui/src/main/webapp/img/medal_gold_3.png
    R gui/admin-gui/src/main/webapp/img/user-blue.png
    R gui/admin-gui/src/main/webapp/img/user-red.png
    R gui/admin-gui/src/main/webapp/js/bootstrap/affix.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/alert.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/button.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/carousel.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/collapse.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/dropdown.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/modal.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/popover.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/scrollspy.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/tab.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/tooltip.js
    R gui/admin-gui/src/main/webapp/js/bootstrap/transition.js
    R gui/admin-gui/src/main/webapp/js/evolveum.js
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/alerts.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/center-block.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/clearfix.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/hide-text.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/image.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/labels.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/list-group.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/nav-divider.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/nav-vertical-align.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/opacity.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/pagination.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/panels.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/progress-bar.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/reset-filter.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/resize.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/responsive-visibility.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/size.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/tab-focus.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/table-row.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-emphasis.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-overflow.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/vendor-prefixes.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/variables.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/.csslintrc
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/404_500_errors.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/alerts.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/bootstrap-social.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/boxes.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/buttons.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/callout.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/carousel.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/control-sidebar.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/core.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/direct-chat.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/dropdown.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/forms.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/fullcalendar.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/header.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/invoice.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/labels.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/lockscreen.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/login_and_register.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/mailbox.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/miscellaneous.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/mixins.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/modal.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/navs.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/print.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/products.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/profile.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/progress-bars.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/select2.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar-mini.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/_all-skins.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow-light.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/small-box.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/social-widgets.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/table.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/timeline.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/users-list.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/variables.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/alerts.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/badges.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/bootstrap.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/breadcrumbs.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/button-groups.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/buttons.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/carousel.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/close.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/code.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/component-animations.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/dropdowns.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/forms.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/glyphicons.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/grid.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/input-groups.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/jumbotron.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/labels.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/list-group.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/media.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/mixins.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/modals.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/navbar.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/navs.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/normalize.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/pager.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/pagination.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/panels.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/popovers.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/print.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/progress-bars.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/responsive-utilities.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/scaffolding.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/tables.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/textarea.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/theme.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/thumbnails.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/tooltip.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/type.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/utilities.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/variables.less
    R gui/admin-gui/src/main/webapp/less/bootstrap/wells.less
    R gui/admin-gui/src/main/webapp/less/custom/bootswatch-sample.less
    R gui/admin-gui/src/main/webapp/less/custom/bootswatch.less
    R gui/admin-gui/src/main/webapp/less/custom/midpoint-variables.less
    R gui/admin-gui/src/main/webapp/less/custom/variables-sample.less
    R gui/admin-gui/src/main/webapp/less/custom/variables.less
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    R gui/admin-gui/src/main/webapp/less/midpoint/bootstrap-override.less
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M gui/admin-gui/src/test/resources/common/user-jack-repo.xml
    M gui/admin-gui/src/test/resources/common/user-jack.xml
    M gui/admin-gui/src/test/resources/wrapper/user.xml
    M infra/prism/pom.xml
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/ParsingContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/util/XNodeProcessorUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.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/ResourceTypeUtil.java
    M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
    M infra/schema/src/main/resources/xml/ns/private/webservice/reportService.wsdl
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/model-context-1.xml
    M model/certification-impl/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/notifications-impl/pom.xml
    M model/report-impl/pom.xml
    R model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ChangesByState.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/ApprovingDummyResourceChangesScenarioBean.java
    M model/workflow-impl/src/test/resources/model-context.obsolete.xml
    M model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
    M model/workflow-impl/src/test/resources/task.obsolete.xml
    M provisioning/provisioning-impl/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlAuditServiceFactory.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/resources/delete/shadow.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/SequenceHelper.java
    M repo/security-impl/pom.xml
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskDeletionListener.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/demo/PageTemplate.html
    M samples/samples-test/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml

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


  Commit: a57260681bfc9060509c50978178b40dad502f96
      https://github.com/Evolveum/midpoint/commit/a57260681bfc9060509c50978178b40dad502f96
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-14 (Thu, 14 Apr 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/progressbar/ProgressbarPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/progressbar/ProgressbarPanel.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/AbstractSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.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/util/SummaryTagSimple.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/wizard/resource/NameStep.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerableFromPrismObjectModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromPrismObjectModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDefinitionSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.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/CapabilitiesPanel.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/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/ResourceSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.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/WorkItemPanel.html
    M 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/WorkItemSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java

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


Compare: https://github.com/Evolveum/midpoint/compare/aa73ea807df0...a57260681bfc

More information about the midPoint-svn mailing list