[midPoint-git] [Evolveum/midpoint] c9f60a: Merge branch 'master' into tmp/mid-5832

mederly noreply at github.com
Fri Oct 11 10:38:03 UTC 2019 

  Branch: refs/heads/tmp/internet2
  Home:   https://github.com/Evolveum/midpoint
  Commit: c9f60aa2724998fea44197b0872798efbe0111d9
      https://github.com/Evolveum/midpoint/commit/c9f60aa2724998fea44197b0872798efbe0111d9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-09 (Wed, 09 Oct 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAttorney.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.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/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    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/RoleSelectionSpecification.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/FilterGizmoAssignableRoles.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/RoleSelectionSpecificationAsserter.java
    A model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/RoleSelectionSpecificationRelationAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/ObjectFilterAsserter.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    A repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/FilterGizmo.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    A repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/FilterGizmoObjectFilterImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Merge branch 'master' into tmp/mid-5832


  Commit: aedccc6e46206b1a711981c7bdf0d819f31a8338
      https://github.com/Evolveum/midpoint/commit/aedccc6e46206b1a711981c7bdf0d819f31a8338
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-10 (Thu, 10 Oct 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LinkedReferencePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismReferenceWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismReferencePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismReferenceValueWrapperImpl.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.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/TestEntitlements.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAssociationAsserter.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAssociationsAsserter.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapComplex.java
    R testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapPolyString.java
    A testing/story/src/test/resources/large-groups/resource-dummy.xml
    A testing/story/src/test/resources/ldap/complex/org-functional-top.xml
    A testing/story/src/test/resources/ldap/complex/org-project-top.xml
    A testing/story/src/test/resources/ldap/complex/resource-opendj.xml
    R testing/story/src/test/resources/ldap/polystring/resource-opendj.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' into tmp/internet2

# Conflicts:
#	provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
#	provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java


  Commit: 09ab31d42676d95934ed02dbc34b7a3938d58c78
      https://github.com/Evolveum/midpoint/commit/09ab31d42676d95934ed02dbc34b7a3938d58c78
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-10 (Thu, 10 Oct 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/PrimitiveXNodeImpl.java
    M infra/schema/src/main/schemadoc/templates/items-inc.vm
    M infra/util/src/main/java/com/evolveum/midpoint/util/caching/AbstractThreadLocalCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/opendj/group-corsairs.xml
    M provisioning/provisioning-impl/src/test/resources/opendj/group-swashbucklers.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java

  Log Message:
  -----------
  Merge branch 'master' into tmp/internet2


  Commit: 28c5ac90456290abf29b8f72c4abbe6d5c666107
      https://github.com/Evolveum/midpoint/commit/28c5ac90456290abf29b8f72c4abbe6d5c666107
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-10 (Thu, 10 Oct 2019)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/MidpointTestMethodContext.java

  Log Message:
  -----------
  Add MidpointTestMethodContext

It holds information specific to execution of any midPoint test method
(currently in AbstractIntegrationTest and children).


  Commit: c7d5d1d9d4655f33be66336d9f457391e9f69148
      https://github.com/Evolveum/midpoint/commit/c7d5d1d9d4655f33be66336d9f457391e9f69148
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-10 (Thu, 10 Oct 2019)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/grouper/TestGrouperAsyncUpdate.java
    A testing/story/src/test/resources/grouper/change-115-staff-add.json
    A testing/story/src/test/resources/grouper/change-210-banderson-add-staff.json
    A testing/story/src/test/resources/grouper/change-310-staff-delete.json
    M testing/story/src/test/resources/grouper/resource-grouper.xml
    M testing/story/src/test/resources/grouper/resource-ldap.xml

  Log Message:
  -----------
  Advance Internet2 Grouper story test

Augmented the test with another group (ref:affiliation:staff) and with
recomputation after membership is deleted. Also turned off
duplicate value avoidance in LDAP resource (maybe temporarily).


  Commit: 23a6f2b18284b207a07e9af77c2c785e6cc54b1e
      https://github.com/Evolveum/midpoint/commit/23a6f2b18284b207a07e9af77c2c785e6cc54b1e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-10-11 (Fri, 11 Oct 2019)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    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/ClockworkMedic.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/grouper/TestGrouperAsyncUpdate.java
    A testing/story/src/test/resources/grouper/change-221-jlewis685-add-staff.json
    M testing/story/src/test/resources/grouper/change-310-staff-delete.json
    M testing/story/src/test/resources/grouper/metarole-grouper-provided-group.xml
    M testing/story/src/test/resources/grouper/resource-grouper.xml
    M testing/story/src/test/resources/grouper/system-configuration.xml
    A testing/story/src/test/resources/grouper/task-group-scavenger.xml
    M testing/story/src/test/resources/grouper/template-user.xml

  Log Message:
  -----------
  Add graceful group deletion in I2 scenario

Org that is deleted from Grouper is put into "archiving" lifecycle
state. Such groups are gracefully removed using special scavenger task.

Also added input/output lens context debug dump to all click and
projector component traces (maybe temporarily).


Compare: https://github.com/Evolveum/midpoint/compare/c9f60aa27249%5E...23a6f2b18284

More information about the midPoint-svn mailing list