[midPoint-git] [Evolveum/midpoint] 3f3a40: tree deltas, poc
Viliam Repan
noreply at github.com
Tue May 14 13:48:08 CEST 2024
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 3f3a40181e99f4956edf255ac729ace845f5d433
https://github.com/Evolveum/midpoint/commit/3f3a40181e99f4956edf255ac729ace845f5d433
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-30 (Tue, 30 Apr 2024)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeContainerDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeContainerDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeItemDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeItemDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeObjectDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeObjectDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreePropertyDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreePropertyDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeReferenceDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeReferenceDeltaValue.java
Log Message:
-----------
tree deltas, poc
Commit: 9c744e4dc739aece2ab907744fcaac4e0a157224
https://github.com/Evolveum/midpoint/commit/9c744e4dc739aece2ab907744fcaac4e0a157224
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-30 (Tue, 30 Apr 2024)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeContainerDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeContainerDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeItemDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeItemDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeObjectDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeObjectDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreePropertyDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreePropertyDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeReferenceDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeReferenceDeltaValue.java
Log Message:
-----------
attempt to improve debug dump, not finished yet
Commit: b989e28b46b40fb4b19a2e39c71509eb7cd8f016
https://github.com/Evolveum/midpoint/commit/b989e28b46b40fb4b19a2e39c71509eb7cd8f016
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-30 (Tue, 30 Apr 2024)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDeltaValue.java
Log Message:
-----------
delta tree now can be built from ObjectDelta
Commit: dd953140fa62859a74877d9f887a719a09b47603
https://github.com/Evolveum/midpoint/commit/dd953140fa62859a74877d9f887a719a09b47603
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-02 (Thu, 02 May 2024)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/credentials/PropagatePasswordPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/selector/eval/FilteringContext.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestExpressionProfiles.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractInitializedSecurityTest.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
A model/model-intest/src/test/resources/security/role-deny-read-assignment-and-roleMembershipRef.xml
A model/model-intest/src/test/resources/security/user-alex.xml
A model/model-intest/src/test/resources/security/user-betty.xml
M model/model-intest/testng-integration-full.xml
M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/PositiveNegativeItemPaths.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/EnforcerFilterOperation.java
R repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/QueryAutzItemPaths.java
A repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/QueryObjectAutzCoverage.java
A repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/QueryObjectsAutzCoverage.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityTraceEvent.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: 121c4edf0aa29163ab54ab8dd63d21c327467ed8
https://github.com/Evolveum/midpoint/commit/121c4edf0aa29163ab54ab8dd63d21c327467ed8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-02 (Thu, 02 May 2024)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDeltaValue.java
Log Message:
-----------
attemp to fix debug dumps
Commit: bd64d17ca94cceb2ee57e0103cd2f475d6f3efbb
https://github.com/Evolveum/midpoint/commit/bd64d17ca94cceb2ee57e0103cd2f475d6f3efbb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-07 (Tue, 07 May 2024)
Changed paths:
M docs/misc/notifications/configuration.adoc
M docs/misc/notifications/general.adoc
M docs/roles-policies/classification/index.adoc
M docs/security/authentication/flexible-authentication/configuration.adoc
A docs/security/authentication/flexible-authentication/modules/archetypeSelection.adoc
A docs/security/authentication/flexible-authentication/modules/attributeVerification.adoc
A docs/security/authentication/flexible-authentication/modules/correlation.adoc
A docs/security/authentication/flexible-authentication/modules/duo.adoc
A docs/security/authentication/flexible-authentication/modules/focusIdentification.adoc
A docs/security/authentication/flexible-authentication/modules/hint.adoc
A docs/security/authentication/flexible-authentication/modules/httpBasic.adoc
A docs/security/authentication/flexible-authentication/modules/httpHeader.adoc
A docs/security/authentication/flexible-authentication/modules/httpSecQ.adoc
A docs/security/authentication/flexible-authentication/modules/ldap.adoc
A docs/security/authentication/flexible-authentication/modules/loginForm.adoc
A docs/security/authentication/flexible-authentication/modules/mailNonce.adoc
A docs/security/authentication/flexible-authentication/modules/oidc.adoc
A docs/security/authentication/flexible-authentication/modules/saml2.adoc
A docs/security/authentication/flexible-authentication/modules/securityQuestionsForm.adoc
M docs/security/credentials/password-reset/index.adoc
M gui/admin-gui/src/frontend/scss/midpoint.scss
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/impl/component/MultivalueContainerListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/CollectionPanelType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/SingleSearchItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/FocusTilePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceUncategorizedPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ShadowStatisticsModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/RoleAnalysisAggregateChartModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/RoleAnalysisAttributeChartModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/RoleAnalysisStackedAttributeChartModel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/model/RoleAnalysisAggregateChartModel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/model/RoleAnalysisAttributeChartModel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/model/RoleAnalysisStackedAttributeChartModel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/ChartInteractionOption.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/ChartScaleAxisOption.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/ChartScaleOption.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/ChartTitleOption.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/RoleAnalysisChartDataSet.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/chart/options/RoleAnalysisChartOptions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/chart/RoleAnalysisAttributeChartPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/chart/RoleAnalysisChartPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/chart/RoleAnalysisChartPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesItemProcessingPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CartSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogQuery.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogQueryItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartEditPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartEditPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ActivityItemProcessingDto.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/authorization/evaluator/MidPointGuiAuthorizationEvaluator.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestExpressionFunctions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuthorizationDiagEvaluation.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/ValueBasedDefinitionLookupsImpl.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/java/com/evolveum/midpoint/model/intest/security/TestSecurityGovernance.java
R model/model-intest/src/test/resources/security/campaigns.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
M pom.xml
M release-notes.adoc
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/filtering/RefFilterWithRepoPath.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObjectMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QSimulationResultMapping.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/PositiveNegativeItemPaths.java
M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/AuthorizationEvaluation.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/AuthorizationFilterEvaluation.java
A repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/AuthorizationSearchItemsEvaluation.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/EnforcerFilterOperation.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/QueryObjectAutzCoverage.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/QueryObjectsAutzCoverage.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityTraceEvent.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SelectorWithItems.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/TieredSelectorWithItems.java
M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/TracingUtil.java
Log Message:
-----------
Merge branch 'master' into feature/tree-delta
Commit: 5e1b5284d389039cd104d6b994ddc016d8f73308
https://github.com/Evolveum/midpoint/commit/5e1b5284d389039cd104d6b994ddc016d8f73308
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-08 (Wed, 08 May 2024)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ObjectTypeSearchItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: e4337d39a48b7dc5f73639f28513f8aa9676f712
https://github.com/Evolveum/midpoint/commit/e4337d39a48b7dc5f73639f28513f8aa9676f712
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-08 (Wed, 08 May 2024)
Changed paths:
M docs/schema/archetypes/configuration.adoc
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: 1f5def001fa56f98016852e87f5a661cd236adf1
https://github.com/Evolveum/midpoint/commit/1f5def001fa56f98016852e87f5a661cd236adf1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-10 (Fri, 10 May 2024)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/Conflict.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/ThreeWayMergeTest.java
Log Message:
-----------
computing conflicts in tree delta
Commit: 1119497d93bef3e5c39b7300916de448aa463d4d
https://github.com/Evolveum/midpoint/commit/1119497d93bef3e5c39b7300916de448aa463d4d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-10 (Fri, 10 May 2024)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
M model/authentication-api/src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java
M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/filter/AuthenticationWrapper.java
M pom.xml
M release-notes.adoc
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: 5d94490d146bf830dccf95f543a91cc9c1364da8
https://github.com/Evolveum/midpoint/commit/5d94490d146bf830dccf95f543a91cc9c1364da8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-10 (Fri, 10 May 2024)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/Conflict.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDeltaValue.java
R infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/ThreeWayMergeTest.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java
Log Message:
-----------
improved debug dump, added more tests
Commit: 7ae96c3a9c0b4b18530e8c7f3046027c67e6bbe8
https://github.com/Evolveum/midpoint/commit/7ae96c3a9c0b4b18530e8c7f3046027c67e6bbe8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ThreeWayMerge.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeDeltaUtils.java
Log Message:
-----------
tree delta to object delta, wip
Commit: 421903c2290253c2b678d5c455782f16c85bd6a3
https://github.com/Evolveum/midpoint/commit/421903c2290253c2b678d5c455782f16c85bd6a3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M docs/roles-policies/classification/index.adoc
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: 9a9f0c62dbe024d6f859c231a7a762f0e8fdff37
https://github.com/Evolveum/midpoint/commit/9a9f0c62dbe024d6f859c231a7a762f0e8fdff37
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/Conflict.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ObjectTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ObjectTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/PropertyTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/PropertyTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ReferenceTreeDelta.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ReferenceTreeDeltaValue.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMerge.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/TreeDeltaUtils.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/package-info.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/Conflict.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/PropertyTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDelta.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ReferenceTreeDeltaValue.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ThreeWayMerge.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/TreeDeltaUtils.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java
Log Message:
-----------
improved package name
Commit: c2d3da311b2894e3291185b92c82c49aee5c3f0f
https://github.com/Evolveum/midpoint/commit/c2d3da311b2894e3291185b92c82c49aee5c3f0f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/SchemaWrapperFactoryImpl.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/SchemaWrapperFactoryImplOld.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/SchemaCache.java
M infra/schema-pure-jaxb/src/compile/resources/catalog.xml
M infra/schema/pom.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeComplexTypeDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeShadowItemDefinitionImpl.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PrismSchemaTypeUtil.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-core-3.xsd
A infra/schema/src/main/resources/xml/ns/public/common/prism-schema-3.xsd
A infra/schema/src/test/java/com/evolveum/midpoint/schema/util/PrismSchemaTypeUtilTest.java
A infra/schema/src/test/resources/schema/schema-extension.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/tree-delta
Commit: 398dde537cb453a561bfaed2c907b2935f62a9f6
https://github.com/Evolveum/midpoint/commit/398dde537cb453a561bfaed2c907b2935f62a9f6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ObjectTreeDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ObjectTreeDeltaValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/TreeDeltaUtils.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java
Log Message:
-----------
tree delta to object delta, tests still failing
Compare: https://github.com/Evolveum/midpoint/compare/68393502a0b7...398dde537cb4
To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications
More information about the midPoint-svn
mailing list