[midPoint-git] [Evolveum/midpoint] 3b0ef1: Preliminary definitionProcessing=ONLY_IF_EXISTS ha...

Sat Jul 15 18:26:57 CEST 2017

  Branch: refs/heads/feature/optimizing-definitions
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3b0ef13777d180070d9e678addb75d6f4e217779
      https://github.com/Evolveum/midpoint/commit/3b0ef13777d180070d9e678addb75d6f4e217779
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.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/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.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/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.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 provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java

  Log Message:
  -----------
  Preliminary definitionProcessing=ONLY_IF_EXISTS handling; enabled when exporting shadows (MID-4076)
Fixed deepClone for ObjectClassCTD.
Optimized deepClone for PrismContainerValue.


  Commit: 76ec55e70f5fdddf98c4960fd145544ad89de9e2
      https://github.com/Evolveum/midpoint/commit/76ec55e70f5fdddf98c4960fd145544ad89de9e2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    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/assignment/AbstractAssignmentListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.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/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.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/users/component/UserSummaryPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/table.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M 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/TestProjectorPersona.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M samples/resources/csv/midpoint-username.csv
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AdUtils.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

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

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java


  Commit: 278a1f15da20ada8135129eb553c9f9b5d9848ae
      https://github.com/Evolveum/midpoint/commit/278a1f15da20ada8135129eb553c9f9b5d9848ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java

  Log Message:
  -----------
  After-merge fix.


  Commit: 393c093837637ebd6edff6aee0b06d1500e9a2f9
      https://github.com/Evolveum/midpoint/commit/393c093837637ebd6edff6aee0b06d1500e9a2f9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.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/RefinedObjectClassDefinitionImpl.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/PrismContainer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java

  Log Message:
  -----------
  Unification of definition tree (turned off for now)


Compare: https://github.com/Evolveum/midpoint/compare/3b0ef13777d1^...393c09383763