[midPoint-git] [Evolveum/midpoint] e0327d: Add basic object type hierarchy features to XSD
mederly
noreply at github.com
Tue Apr 26 00:20:53 CEST 2022
Branch: refs/heads/feature/synchronization-definition-update
Home: https://github.com/Evolveum/midpoint
Commit: e0327df1004ed2e812579902c0e7f541892b33ea
https://github.com/Evolveum/midpoint/commit/e0327df1004ed2e812579902c0e7f541892b33ea
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-20 (Wed, 20 Apr 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDetailsDto.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
Add basic object type hierarchy features to XSD
(Plus minor code cleanup.)
Commit: 29c0a6eeef5368c18c479434be5796a465284c0b
https://github.com/Evolveum/midpoint/commit/29c0a6eeef5368c18c479434be5796a465284c0b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-26 (Tue, 26 Apr 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceDetailsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
M infra/schema-pure-jaxb/src/compile/resources/catalog.xml
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ClockworkSettings.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/RefinedResourceSchemaParser.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectClassDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDelineation.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeSynchronizationPolicy.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceSchema.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceSchemaFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationActionDefinition.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicy.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicyFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationReactionDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/deleg/ResourceObjectDefinitionDelegator.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/common-resources-3.xsd
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
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/ModelProjectionContext.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationResult.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelatorConfiguration.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/impl/correlator/FullCorrelationContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/classification/ResourceObjectClassifierImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/classification/ShadowTagGeneratorImpl.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/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelatorContextCreator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModel.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/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckItemProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ElementState.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
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/AssignedResourceObjectConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/PlainResourceObjectConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ResourceObjectConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ComplexConstructionConsumer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/ClockworkShadowInboundsPreparation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/loader/ProjectionFullLoadOperation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingInitializer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/scriptExecutor/AsynchronousScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/scriptExecutor/ScriptingTaskCreator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/Action.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ActionManager.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationProcessing.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationExpressionsEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/AddFocusAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/BaseAction.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/BaseClockworkAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/DeleteFocusAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/DeleteShadowAction.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/EmptyAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/InactivateFocusAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/InactivateShadowAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/LinkAction.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/StandardActionsRegistrar.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/SynchronizationAction.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/SynchronizeAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/UnlinkAction.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/ActionDefinitionClass.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/ActionInstantiationContext.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/ActionUris.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/SynchronizationActionExecutor.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/SynchronizationActionFactory.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanPartialRun.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ModelImplUtils.java
M model/model-impl/src/main/resources/ctx-model.xml
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/expr/ExpressionHandlerImplTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignedMappings.java
R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImplTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfirmationEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java
M model/model-impl/src/test/resources/common/resource-dummy-dependency-filter.xml
A model/model-impl/src/test/resources/common/resource-dummy-scripts.xml
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/testng-unit.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMemberRecompute.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/TestModelServiceContractCaching.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.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/tasks/TestTaskReporting.java
M model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
A model/model-intest/src/test/resources/mapping/task-dummy-tea-green-livesync.xml
R model/model-intest/src/test/resources/mapping/task-dumy-tea-green-livesync.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ModelRestController.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContextFactory.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/GetHelper.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.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/TestDummyExtra.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyIncomplete.java
M provisioning/ucf-impl-connid/src/test/resources/resource-dummy.xml
M provisioning/ucf-impl-connid/src/test/resources/resource-opendj.xml
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
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/RefinedResourceSchemaAsserter.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/consistency/TestConsistencyMechanism.java
Log Message:
-----------
Continue improving resource-related schema
Here we continue improving the resource schema, namely by moving parts
of the "synchronization" section right to the object type definitions.
In particular, "objectSetDelineation", "focusType", and "correlation"
were added, and recently-added "synchronization" was changed to embrace
only the synchronization reactions instead of the whole synchronization
configuration. This has lead to numerous changes in the synchronization-
related code.
Work in progress. Many things are only sketched here out.
TestCorrelationConfirmationEvaluator was temporarily disabled.
Related changes:
1. Added the "include" directive meant to implement resource templates;
but with no specific implementation yet.
2. The objectClass property in synchronization section is now (finally)
single-valued.
3. The synchronization actions (addFocus, link, unlink, and so on) were
migrated from "untyped" form of URIs + (currently unused) generic
parameters to statically-typed versions (<addFocus>, <link>, <unlink>,
and so on).
4. Reworked synchronization actions code to embrace future
non-clockwork-based actions as well.
5. Created common-resources-3.xsd with definitions related to resources
(but not moving legacy definitions there, yet).
6. Added ConfigurationException to the signature of
ResourceSchemaFactory#getCompleteSchema method (propagating upwards
to many places).
7. Fixed opportunistic sync handling code (now taking the opportunistic
sync flag correctly into account). Replaced matchUserCorrelationRule by
standard correlation call. It may be less efficient but is more general.
Compare: https://github.com/Evolveum/midpoint/compare/edca82e1695e...29c0a6eeef53
More information about the midPoint-svn
mailing list