[midPoint-git] [Evolveum/midpoint] b4c5ce: Storing policy situation in focus/assignment, firs...

Pavol Mederly mederly at evolveum.com
Thu Mar 2 18:49:45 CET 2017 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: b4c5ce204cb0c83a2770a2c1aac4996d7fa2b756
      https://github.com/Evolveum/midpoint/commit/b4c5ce204cb0c83a2770a2c1aac4996d7fa2b756
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.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/lens/TestPolicySituations.java
    A model/model-impl/src/test/resources/lens/role-judge-situation-only.xml
    A model/model-impl/src/test/resources/lens/role-pirate-situation-only.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml

  Log Message:
  -----------
  Storing policy situation in focus/assignment, first draft (not much tested).


  Commit: 49bb96d8d8d23c41d591765580932a7fb347b1e7
      https://github.com/Evolveum/midpoint/commit/49bb96d8d8d23c41d591765580932a7fb347b1e7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.6/h2/h2-3.6.sql
    M config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    M config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    M config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    M config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    M config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    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/init/ModelInitialSetup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/RepoInitialSetup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    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/java/com/evolveum/midpoint/web/page/PageDialog.html
    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/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.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/AssignmentConflictPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-init.xml
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/hide-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/image.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/list-group.less
    M 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/reset-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/responsive-visibility.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-emphasis.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/vendor-prefixes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/variables.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/.csslintrc
    M 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-without-plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/alerts.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/bootstrap-social.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/boxes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/control-sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/core.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/direct-chat.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/dropdown.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/fullcalendar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/header.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/labels.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/lockscreen.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/login_and_register.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mailbox.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/miscellaneous.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/modal.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/navs.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/print.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/products.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/profile.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/progress-bars.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/select2.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar-mini.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/small-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/social-widgets.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/timeline.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/users-list.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/variables.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/FullTextFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterEntry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    A infra/prism/src/test/resources/query/filter-not-full-text.xml
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/AbstractOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/SystemConfigurationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.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/LensUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointJsonProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointYamlProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.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/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RActivation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedNamedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/ROperationalState.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectTextInfoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.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/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    A samples/objects/full-text-search.xml
    M testing/rest/pom.xml
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    R testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceYaml.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    A testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    R testing/rest/src/test/resources/repo/account-chuck.xml
    A testing/rest/src/test/resources/repo/json/account-chuck.json
    A testing/rest/src/test/resources/repo/json/role-adder.json
    A testing/rest/src/test/resources/repo/json/role-modifier.json
    A testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/json/user-nopassword.json
    A testing/rest/src/test/resources/repo/json/user-template.json
    R testing/rest/src/test/resources/repo/role-adder.xml
    R testing/rest/src/test/resources/repo/role-modifier.xml
    R testing/rest/src/test/resources/repo/user-darthadder.xml
    R testing/rest/src/test/resources/repo/user-nopassword.xml
    R testing/rest/src/test/resources/repo/user-template.xml
    A testing/rest/src/test/resources/repo/xml/account-chuck.xml
    A testing/rest/src/test/resources/repo/xml/role-adder.xml
    A testing/rest/src/test/resources/repo/xml/role-modifier.xml
    A testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    A testing/rest/src/test/resources/repo/xml/user-nopassword.xml
    A testing/rest/src/test/resources/repo/xml/user-template.xml
    A testing/rest/src/test/resources/repo/yaml/account-chuck.yml
    A testing/rest/src/test/resources/repo/yaml/role-adder.yml
    A testing/rest/src/test/resources/repo/yaml/role-modifier.yml
    A testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/repo/yaml/user-nopassword.yml
    A testing/rest/src/test/resources/repo/yaml/user-template.yml
    A testing/rest/src/test/resources/req/json/modification-assign-role-modifier.json
    A testing/rest/src/test/resources/req/json/modification-disable.json
    A testing/rest/src/test/resources/req/json/modification-enable.json
    R testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    R testing/rest/src/test/resources/req/modification-disable.xml
    R testing/rest/src/test/resources/req/modification-enable.xml
    A testing/rest/src/test/resources/req/xml/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/xml/modification-disable.xml
    A testing/rest/src/test/resources/req/xml/modification-enable.xml
    A testing/rest/src/test/resources/req/yaml/modification-assign-role-modifier.yml
    A testing/rest/src/test/resources/req/yaml/modification-disable.yml
    A testing/rest/src/test/resources/req/yaml/modification-enable.yml
    M testing/rest/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/sod-certification

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java


  Commit: ea5cad136117de6c225a090082aba626b3f1b959
      https://github.com/Evolveum/midpoint/commit/ea5cad136117de6c225a090082aba626b3f1b959
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/AccessCertificationReviewerDto.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/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FullTextSearchConfigurationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/test/resources/common/certification-of-role-inducements.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/expr/MidpointFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.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/expr/ExpressionHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ModelExpressionThreadLocalHolder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

  Log Message:
  -----------
  Merge branch 'master' into feature/sod-certification


  Commit: 6f9034498431baf3e6a51c39861d262e7f0ac0a0
      https://github.com/Evolveum/midpoint/commit/6f9034498431baf3e6a51c39861d262e7f0ac0a0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    A model/certification-impl/src/test/resources/common/org-security-team.xml
    M model/certification-impl/src/test/resources/common/user-jack.xml
    M model/certification-impl/src/test/resources/sod/sod-certification.xml

  Log Message:
  -----------
  Ability to specify abstract role as a certification reviewer (expanding when resolving reviewers for cert case).


  Commit: da7046439206f1726f724c54b18b72c949fb7c22
      https://github.com/Evolveum/midpoint/commit/da7046439206f1726f724c54b18b72c949fb7c22
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/resources/truststore.jks

  Log Message:
  -----------
  Merge branch 'master' into feature/sod-certification


  Commit: c4b42ab46d05aa72fcec26f06b6c16b712af52bd
      https://github.com/Evolveum/midpoint/commit/c4b42ab46d05aa72fcec26f06b6c16b712af52bd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    A config/rest/index.html
    A config/rest/swagger.yml
    M gui/admin-gui/pom.xml
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.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/util/RestServiceUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A samples/rest/query-paging.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/sod-certification

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java


  Commit: 650afd61168ca8ad2f186bce6dcf98502e46e4ae
      https://github.com/Evolveum/midpoint/commit/650afd61168ca8ad2f186bce6dcf98502e46e4ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/sod-certification


  Commit: 1226980c28e49f64cd6bc4922d989c5b1d1ba563
      https://github.com/Evolveum/midpoint/commit/1226980c28e49f64cd6bc4922d989c5b1d1ba563
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M testing/story/src/test/resources/strings/roles/global-policy-rules.xml

  Log Message:
  -----------
  Fixed story sample + minor GUI 'null' issue


  Commit: ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
      https://github.com/Evolveum/midpoint/commit/ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  SoD certification test.


  Commit: 09602fbb4b5f1389d2fb17cd7fba5630a99c8664
      https://github.com/Evolveum/midpoint/commit/09602fbb4b5f1389d2fb17cd7fba5630a99c8664
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    A samples/certification/sod/a-test-2a.xml
    A samples/certification/sod/a-test-2b.xml
    A samples/certification/sod/a-test-3a.xml
    A samples/certification/sod/a-test-3b.xml
    A samples/certification/sod/a-test-3x.xml
    A samples/certification/sod/a-test-3y.xml
    A samples/certification/sod/sod-certification.xml
    A samples/certification/sod/user-jack.xml

  Log Message:
  -----------
  SoD certification samples.


  Commit: 61954b37f118cf47ca5fa208475c0f210fbb162e
      https://github.com/Evolveum/midpoint/commit/61954b37f118cf47ca5fa208475c0f210fbb162e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java

  Log Message:
  -----------
  GUI fixes related to SoD certification.


  Commit: 30b1f99da3097d26ed5849451bf06327aaa15afe
      https://github.com/Evolveum/midpoint/commit/30b1f99da3097d26ed5849451bf06327aaa15afe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M config/rest/index.html
    M config/rest/swagger.yml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/sod-certification


Compare: https://github.com/Evolveum/midpoint/compare/46f874e50fab...30b1f99da309

More information about the midPoint-svn mailing list