[midPoint-git] [Evolveum/midpoint] 049147: Basic implementation of object merge (model) (MID-...
Radovan Semancik
radovan.semancik at evolveum.com
Fri Oct 21 15:24:11 CEST 2016
Branch: refs/heads/support-3.4
Home: https://github.com/Evolveum/midpoint
Commit: 049147dbab551d907112a2898612451bc85a1547
https://github.com/Evolveum/midpoint/commit/049147dbab551d907112a2898612451bc85a1547
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
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/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/testng-integration.xml
Log Message:
-----------
Basic implementation of object merge (model) (MID-3460)
Commit: 52e391e644f91bf5126961408ff578e5e5493fe3
https://github.com/Evolveum/midpoint/commit/52e391e644f91bf5126961408ff578e5e5493fe3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
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
Log Message:
-----------
Identity merge, second step (MID-3460)
Commit: cbb33c6375f7efb95721987dda6f1d903c25c9e2
https://github.com/Evolveum/midpoint/commit/cbb33c6375f7efb95721987dda6f1d903c25c9e2
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
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/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Support for multiple merge configurations (MID-3460)
Commit: a1f118e31c7c62c54daeda6f753d520bf69271cd
https://github.com/Evolveum/midpoint/commit/a1f118e31c7c62c54daeda6f753d520bf69271cd
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
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/ModelInteractionService.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-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
M model/model-intest/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Object merge, step 3: expressions (MID-3460)
Commit: b9752056b3bcfaa2316dded09d95e07703cb848d
https://github.com/Evolveum/midpoint/commit/b9752056b3bcfaa2316dded09d95e07703cb848d
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge objects gui: first step
Commit: 4582ce667d9966b491a6c893ceb2b6a4c6116278
https://github.com/Evolveum/midpoint/commit/4582ce667d9966b491a6c893ceb2b6a4c6116278
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
Log Message:
-----------
Merge Objects gui implementing
Commit: 35bedeb5b916ac4d1b834250d683981e6c931330
https://github.com/Evolveum/midpoint/commit/35bedeb5b916ac4d1b834250d683981e6c931330
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
Log Message:
-----------
Merge Objects gui implementing
Commit: 90fefe1eb3d1f5ae4cdc5cd2ba684c288cfc7a32
https://github.com/Evolveum/midpoint/commit/90fefe1eb3d1f5ae4cdc5cd2ba684c288cfc7a32
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge Objects page extends PageAdminFocus
Commit: cf21cae8d16aa2cc70cd2e14607fa2bf631105b5
https://github.com/Evolveum/midpoint/commit/cf21cae8d16aa2cc70cd2e14607fa2bf631105b5
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
Log Message:
-----------
Merge Objects page
Commit: 587c0b228d5773a263772ee8e4fda1c5c90650d9
https://github.com/Evolveum/midpoint/commit/587c0b228d5773a263772ee8e4fda1c5c90650d9
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge Objects: switch direction button
Commit: bdf337bae7a4d42da0681024037138fbfa1719cc
https://github.com/Evolveum/midpoint/commit/bdf337bae7a4d42da0681024037138fbfa1719cc
Author: honchar <honchar at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
Log Message:
-----------
Merge Objects: models fix
Commit: d2c22daff15d42693364ad55e3b076db3a30e732
https://github.com/Evolveum/midpoint/commit/d2c22daff15d42693364ad55e3b076db3a30e732
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
Log Message:
-----------
Object merge stylesheets (MID-3460)
Commit: 7160a38bd5df3245055ddff46c9628a2f5bb52d6
https://github.com/Evolveum/midpoint/commit/7160a38bd5df3245055ddff46c9628a2f5bb52d6
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
Log Message:
-----------
Fixing NPE in object merge code (MID-3460)
Commit: 6b3709b0b5e55df1db185dbb9e33fff29aedde5a
https://github.com/Evolveum/midpoint/commit/6b3709b0b5e55df1db185dbb9e33fff29aedde5a
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/PanelTab.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
Log Message:
-----------
Backporting object merge to support branch (MID-3460)
Compare: https://github.com/Evolveum/midpoint/compare/ffb8019c7a84...6b3709b0b5e5
More information about the midPoint-svn
mailing list