[midPoint-git] [Evolveum/midpoint] 02cd10: Attempt to fix policy rule-based exclusions.

Pavol Mederly mederly at evolveum.com
Tue Jan 24 23:02:07 CET 2017


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 02cd107f89fb7b6fc46f72400cedee0f3bd11682
      https://github.com/Evolveum/midpoint/commit/02cd107f89fb7b6fc46f72400cedee0f3bd11682
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java

  Log Message:
  -----------
  Attempt to fix policy rule-based exclusions.


  Commit: f93b8e3e9f4e01445cf2c75441537e07bbc20d50
      https://github.com/Evolveum/midpoint/commit/f93b8e3e9f4e01445cf2c75441537e07bbc20d50
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerWrapperFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java
    A testing/story/src/test/resources/ldap-dependency/org-top.xml
    A testing/story/src/test/resources/ldap-dependency/resource-opendj.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-supervip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org-vip.xml
    A testing/story/src/test/resources/ldap-dependency/role-meta-org.xml
    M testing/story/testng-integration.xml

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


  Commit: c8cac31d49640a9e494ef3ad630da9a7784dff01
      https://github.com/Evolveum/midpoint/commit/c8cac31d49640a9e494ef3ad630da9a7784dff01
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestReconScript.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    A model/model-impl/src/test/resources/lens/role-judge.xml
    M model/model-impl/testng-unit.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java

  Log Message:
  -----------
  Basic policy rules unit tests. Some model-impl test refactor.


  Commit: b660cae54a0b3613695eb13be5ba08db0b516f6e
      https://github.com/Evolveum/midpoint/commit/b660cae54a0b3613695eb13be5ba08db0b516f6e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    A model/model-impl/src/test/resources/lens/role-constable.xml

  Log Message:
  -----------
  More exclusion tests, fixed bug introduced in previous commit.


  Commit: b6e33a0c8ad1a8e90b7c6b511d1a18ed22c8ae8e
      https://github.com/Evolveum/midpoint/commit/b6e33a0c8ad1a8e90b7c6b511d1a18ed22c8ae8e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java

  Log Message:
  -----------
  Refactoring AssignmentProcessor, part 1


  Commit: 67479a4072ae6111fae8012250c55c00ebe0b6cf
      https://github.com/Evolveum/midpoint/commit/67479a4072ae6111fae8012250c55c00ebe0b6cf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    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
    A 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/TestAssignmentProcessor.java

  Log Message:
  -----------
  Refactoring AssignmentProcessor, part 2


  Commit: 25723dc548ae71c3ec04e996263beba01e67a58c
      https://github.com/Evolveum/midpoint/commit/25723dc548ae71c3ec04e996263beba01e67a58c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.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/TestPolicyRules.java
    M model/model-impl/src/test/resources/lens/role-constable.xml
    M model/model-impl/src/test/resources/lens/role-judge.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/role-prize-silver.xml

  Log Message:
  -----------
  Basic role pruning seems to work (MID-3685)


  Commit: 64c273c7cbafcab13c1a08a8b444a825df64a4c4
      https://github.com/Evolveum/midpoint/commit/64c273c7cbafcab13c1a08a8b444a825df64a4c4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  More role pruning tests (MID-3685)


  Commit: 2c0bfe835f86fea848ddec5b348effe04420e155
      https://github.com/Evolveum/midpoint/commit/2c0bfe835f86fea848ddec5b348effe04420e155
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.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/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    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/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSegregationOfDuties.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Policy rule exceptions


  Commit: a29de538d3efe4ea2daaeb70168cc0200f0a8174
      https://github.com/Evolveum/midpoint/commit/a29de538d3efe4ea2daaeb70168cc0200f0a8174
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

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


  Commit: cefef5ef8cb34169e8402737517a69410e67844b
      https://github.com/Evolveum/midpoint/commit/cefef5ef8cb34169e8402737517a69410e67844b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  Assignmen + policy security


  Commit: 81c71b9c07885b790141ffa3c49ce4b637aa50d0
      https://github.com/Evolveum/midpoint/commit/81c71b9c07885b790141ffa3c49ce4b637aa50d0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M build-system/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/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchemaImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemInfo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.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/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
    A infra/schema/src/test/resources/common/json/no-ns/form.json
    A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
    A infra/schema/src/test/resources/common/json/ns/form.json
    A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    A infra/schema/src/test/resources/common/xml/no-ns/form.xml
    A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/xml/ns/form.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
    A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
    A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
    A infra/schema/src/test/resources/common/yaml/ns/form.yaml
    A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/schema/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

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


  Commit: c81258a510955b1fcd6e7e991764245cc12f834c
      https://github.com/Evolveum/midpoint/commit/c81258a510955b1fcd6e7e991764245cc12f834c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  More compact exclusion format


  Commit: b2de2103ded5898f3d4d2da2478332906fbd8b86
      https://github.com/Evolveum/midpoint/commit/b2de2103ded5898f3d4d2da2478332906fbd8b86
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/processes/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.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/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/TriggeredApprovalAction.java
    M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
    M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
    M model/workflow-impl/src/test/resources/policy/sod/role-thief.xml

  Log Message:
  -----------
  SoD approval. Approver instruction. Approval level information in GUI. (Still not quite finished.)


  Commit: bc881d687423b7a25a1a41643f6f9a5a20794ffd
      https://github.com/Evolveum/midpoint/commit/bc881d687423b7a25a1a41643f6f9a5a20794ffd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

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


  Commit: 2befe7ebc609cb5c7e649fbd569f20019df91d45
      https://github.com/Evolveum/midpoint/commit/2befe7ebc609cb5c7e649fbd569f20019df91d45
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.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 infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.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/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/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/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/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.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/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java

  Log Message:
  -----------
  Generalized level to stage (for all process types). Applied approvalInstruction to all process types. Using stage info in audit log and decision information in GUI.


  Commit: 7a6d01304f96a354deba7fa3163a0ec9c7796758
      https://github.com/Evolveum/midpoint/commit/7a6d01304f96a354deba7fa3163a0ec9c7796758
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WorkflowResult.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/WfTestUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java

  Log Message:
  -----------
  Fixing wf tests.


  Commit: d01ea0de6e5856e779c7a81da4c5a9074c9a9292
      https://github.com/Evolveum/midpoint/commit/d01ea0de6e5856e779c7a81da4c5a9074c9a9292
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.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/EvaluatedAssignmentImpl.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/LensUtil.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
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    A model/model-impl/src/test/resources/lens/role-thief.xml

  Log Message:
  -----------
  "Secondary" policy situations ... constraints acting on pre-computed policy situations.


  Commit: 0dfd3a91b68d67b8cf867c302afd23d85fd3e79b
      https://github.com/Evolveum/midpoint/commit/0dfd3a91b68d67b8cf867c302afd23d85fd3e79b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.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/WorkItemDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java

  Log Message:
  -----------
  Showing stage in process instance lists.


  Commit: 2b62c2ee87a827aaf872d5bfa81cb9ab5f29b9e3
      https://github.com/Evolveum/midpoint/commit/2b62c2ee87a827aaf872d5bfa81cb9ab5f29b9e3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FormTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/dataModel/DataModelVisualizerImpl.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/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-read-some-roles.xml

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


  Commit: 62a623ce7c1c93529134422e59e3811cc0245bd5
      https://github.com/Evolveum/midpoint/commit/62a623ce7c1c93529134422e59e3811cc0245bd5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java

  Log Message:
  -----------
  Fixed NPE in GUI (non-recomputed users)


  Commit: 2aa87aa54673ef76eb5c978623f65ebf33e35e7d
      https://github.com/Evolveum/midpoint/commit/2aa87aa54673ef76eb5c978623f65ebf33e35e7d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java

  Log Message:
  -----------
  Stage info also for wf notifications.


  Commit: fef96a7790bbb9f0a899550599722eac0fd24740
      https://github.com/Evolveum/midpoint/commit/fef96a7790bbb9f0a899550599722eac0fd24740
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SerializableBooleanProducer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Fixed serialization bug for lambdas in VisibleBehavior. Added experimental "all relations" for role members page.


  Commit: 83999b3121a9f789c8b505e225dd8eb973977448
      https://github.com/Evolveum/midpoint/commit/83999b3121a9f789c8b505e225dd8eb973977448
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Added stage info to various places in GUI.


  Commit: d2094381c56b5d4428f8a0505ecaf6f74b3802da
      https://github.com/Evolveum/midpoint/commit/d2094381c56b5d4428f8a0505ecaf6f74b3802da
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.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/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/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.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/tasks/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java

  Log Message:
  -----------
  Added stage info to yet another places in GUI. Added stage-related info to WorkItemType for easier access.


  Commit: 156c2d2a14aaa1505f104e3512c3f4cef18b7633
      https://github.com/Evolveum/midpoint/commit/156c2d2a14aaa1505f104e3512c3f4cef18b7633
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    A testing/story/src/test/resources/strings/roles-2/a-test-1.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    R testing/story/src/test/resources/strings/roles/test-1.xml
    M testing/story/src/test/resources/strings/users/cheese.xml
    M testing/story/src/test/resources/strings/users/chef.xml

  Log Message:
  -----------
  Updated wf samples.


  Commit: 4ebbb52c1072ca06fb6946d4c26e30163bd8172c
      https://github.com/Evolveum/midpoint/commit/4ebbb52c1072ca06fb6946d4c26e30163bd8172c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    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/EvaluatedAssignmentTargetImpl.java
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml

  Log Message:
  -----------
  Fixed default policy actions for legacy constraints. Fixed defaults in test data.


  Commit: 67a118dacf9685dfbb69d51eef87cff14b10ca5a
      https://github.com/Evolveum/midpoint/commit/67a118dacf9685dfbb69d51eef87cff14b10ca5a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/schema/pom.xml
    M samples/model-client-sample/pom.xml
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  Some maven magic to get rid of dependency problems.


Compare: https://github.com/Evolveum/midpoint/compare/d7c25154ff90...67a118dacf96


More information about the midPoint-svn mailing list