[midPoint-git] [Evolveum/midpoint] 9eef54: Migrate tags to marks
mederly
noreply at github.com
Wed Feb 1 13:30:58 CET 2023
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 9eef54ba17767a320dbb3de12454c07c25ca1532
https://github.com/Evolveum/midpoint/commit/9eef54ba17767a320dbb3de12454c07c25ca1532
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-02-01 (Wed, 01 Feb 2023)
Changed paths:
M config/sql/native-new/postgres-new-upgrade.sql
M config/sql/native-new/postgres-new.sql
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/gui/impl/component/menu/PageTypes.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchContext.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/AvailableTagItemWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/AvailableTagSearchItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/ProcessedObjectsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/ProcessedObjectsProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/widget/MetricWidgetPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/GlobalPolicyRuleContentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/GlobalPolicyRuleCounter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/tag/PageTag.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/tag/PageTags.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
M gui/admin-gui/src/test/resources/schema/piracy.xsd
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MarkTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SimulationMetricReferenceTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SimulationMetricValuesTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SimulationResultTypeUtil.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/TagTypeUtil.java
M infra/schema/src/main/resources/default-caching-profile.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-simulations-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/simulations/TestSimulationMetricComputations.java
M infra/schema/src/test/resources/simulations/test1-base.xml
M infra/schema/src/test/resources/simulations/test1-delta.xml
M infra/schema/src/test/resources/simulations/test1-expected-sum-collapsed.xml
M infra/schema/src/test/resources/simulations/test1-expected-sum.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/simulation/ProcessedObject.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/MarkManager.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/TagManager.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.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/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PolicyRulesContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/simulation/AggregatedMetricsComputation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/simulation/ProcessedObjectImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/simulation/SimulationMetricReference.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectionPolicyRules.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/AbstractBasicSimulationExecutionTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/AbstractSimulationsTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/TestProductionSimulations.java
M model/model-intest/src/test/resources/schema/piracy.xsd
A model/model-intest/src/test/resources/simulation/mark-user-add.xml
A model/model-intest/src/test/resources/simulation/mark-user-delete.xml
M model/model-intest/src/test/resources/simulation/system-configuration.xml
R model/model-intest/src/test/resources/simulation/tag-user-add.xml
R model/model-intest/src/test/resources/simulation/tag-user-delete.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/CommonInitialObjects.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/SimulationResult.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ElementContextAsserter.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ProcessedObjectAsserter.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/SimulationResultAsserter.java
M model/notifications-impl/src/test/resources/schema/piracy.xsd
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryBeanConfig.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MObjectType.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/MProcessedObjectEventMarkReference.java
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/MProcessedObjectEventTagReference.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectEventMarkReference.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectEventMarkReferenceMapping.java
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectEventTagReference.java
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectEventTagReferenceMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectMapping.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/tag/QMark.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/tag/QMarkMapping.java
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/tag/QTag.java
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/tag/QTagMapping.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SimulationsBaselineTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.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/asserter/AbstractAsserter.java
A repo/system-init/src/main/resources/initial-objects/archetype/700-archetype-event-mark.xml
R repo/system-init/src/main/resources/initial-objects/archetype/700-archetype-event-tag.xml
A repo/system-init/src/main/resources/initial-objects/archetype/701-archetype-object-mark.xml
R repo/system-init/src/main/resources/initial-objects/archetype/701-archetype-policy-situation.xml
A repo/system-init/src/main/resources/initial-objects/mark/710-mark-focus-activated.xml
A repo/system-init/src/main/resources/initial-objects/mark/711-mark-focus-deactivated.xml
A repo/system-init/src/main/resources/initial-objects/mark/712-mark-focus-renamed.xml
A repo/system-init/src/main/resources/initial-objects/mark/713-mark-focus-assignment-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/714-mark-focus-archetype-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/715-mark-focus-parent-org-reference-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/716-mark-focus-role-membership-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/730-mark-projection-activated.xml
A repo/system-init/src/main/resources/initial-objects/mark/731-mark-projection-deactivated.xml
A repo/system-init/src/main/resources/initial-objects/mark/732-mark-projection-renamed.xml
A repo/system-init/src/main/resources/initial-objects/mark/733-mark-projection-identifier-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/734-mark-projection-entitlement-changed.xml
A repo/system-init/src/main/resources/initial-objects/mark/735-mark-projection-password-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/710-tag-focus-activated.xml
R repo/system-init/src/main/resources/initial-objects/tag/711-tag-focus-deactivated.xml
R repo/system-init/src/main/resources/initial-objects/tag/712-tag-focus-renamed.xml
R repo/system-init/src/main/resources/initial-objects/tag/713-tag-focus-assignment-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/714-tag-focus-archetype-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/715-tag-focus-parent-org-reference-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/716-tag-focus-role-membership-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/730-tag-projection-activated.xml
R repo/system-init/src/main/resources/initial-objects/tag/731-tag-projection-deactivated.xml
R repo/system-init/src/main/resources/initial-objects/tag/732-tag-projection-renamed.xml
R repo/system-init/src/main/resources/initial-objects/tag/733-tag-projection-identifier-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/734-tag-projection-entitlement-changed.xml
R repo/system-init/src/main/resources/initial-objects/tag/735-tag-projection-password-changed.xml
R repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskObjectProcessingListener.java
M testing/rest/src/test/resources/schema/piracy.xsd
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFirstSteps.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
M testing/story/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Migrate tags to marks
For example, TagType to MarkType, tagRef to markRef, and so on.
Includes PostgreSQL scripts.
The work may not be 100% complete. Any remaining places referencing
tags should be migrated gradually.
Note: MarkType in piracy.xsd was renamed to PiracyMarkType, to avoid
the need for type name qualification in all places.
Commit: 050861d22e0a6543f70f3df7020c6dca2e480cfd
https://github.com/Evolveum/midpoint/commit/050861d22e0a6543f70f3df7020c6dca2e480cfd
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-02-01 (Wed, 01 Feb 2023)
Changed paths:
M config/sql/native-new/postgres-new-upgrade.sql
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResults.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/SimulationResultsPanel.java
Log Message:
-----------
Fix the DB upgrade script
Commit: 9f3f3bbd716a05bc1a2a2578a22fdadddc8acf68
https://github.com/Evolveum/midpoint/commit/9f3f3bbd716a05bc1a2a2578a22fdadddc8acf68
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2023-02-01 (Wed, 01 Feb 2023)
Changed paths:
M model/report-impl/src/test/resources/logback-test.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/3546028ab014...9f3f3bbd716a
More information about the midPoint-svn
mailing list