[midPoint-git] [Evolveum/midpoint] ca20dc: Add template expansion engine

mederly noreply at github.com
Tue Dec 10 16:08:43 UTC 2019


  Branch: refs/heads/tmp/configuration2
  Home:   https://github.com/Evolveum/midpoint
  Commit: ca20dc3d549b5d03c602c0a76253a986e92069a6
      https://github.com/Evolveum/midpoint/commit/ca20dc3d549b5d03c602c0a76253a986e92069a6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-12-09 (Mon, 09 Dec 2019)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/TemplateUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/AbstractChainedResolver.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/JavaPropertiesResolver.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/MapResolver.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/OsEnvironmentResolver.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/ReferenceResolver.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/TemplateEngine.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/template/TemplateResolution.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/TestMiscUtil.java
    A infra/util/src/test/java/com/evolveum/midpoint/util/TestTemplateEngine.java
    M infra/util/testng-unit.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    A repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/PartitioningTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java

  Log Message:
  -----------
  Add template expansion engine

This is a generic template expansion engine. Here we use it to implement
expressions for cluster node identifiers (-Dmidpoint.nodeIdExpression).

It is the first part of resolution of MID-5904.


  Commit: cae902cc5c249f9cd976b9d98171120793d49970
      https://github.com/Evolveum/midpoint/commit/cae902cc5c249f9cd976b9d98171120793d49970
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-12-09 (Mon, 09 Dec 2019)

  Changed paths:
    M build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    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/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismReferenceWrapperColumnPanel.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/LinkedReferencePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/PolyStringPropertyColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemListWithDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDto.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/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/CaseWorkItemSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractObjectDummyConnector.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xjc/PropertyArrayList.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPropertyArrayList.java
    M infra/prism-impl/testng-unit.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/test/resources/localization/Midpoint_sk.properties
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestWriter.java
    A testing/story/src/test/resources/writer/resource-writer.xml
    M testing/story/testng-integration.xml
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/EditResourceConfigurationPage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 82381c2c4c8c24e501640679dcdeb2afe836bef6
      https://github.com/Evolveum/midpoint/commit/82381c2c4c8c24e501640679dcdeb2afe836bef6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-12-10 (Tue, 10 Dec 2019)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/template/ReferenceResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Add dead nodes handling (MID-5904)

Marking nodes that have not checked-in for 30 seconds as down.
Avoiding REST calls to nodes that are marked as down.
Deleting dead nodes according to specified clean-up policy.
Minor fixes in cleanup task handler and closed task cleanup method.
New XmlTypeConverter.compareMillis method.


  Commit: 017ef1fa20b5e6ef338be42be98e362b204672cf
      https://github.com/Evolveum/midpoint/commit/017ef1fa20b5e6ef338be42be98e362b204672cf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-12-10 (Tue, 10 Dec 2019)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    M provisioning/ucf-impl-connid/pom.xml
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/audit-api/pom.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java
    M repo/audit-impl/pom.xml
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java
    M repo/repo-api/pom.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditServiceFactory.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ProtectorConfiguration.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/SystemConfigurationSectionImpl.java
    M repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/InitializationBeanPostprocessor.java

  Log Message:
  -----------
  Migrate to Apache Commons Configuration 2

Currently this does not work because of some POM dependencies.


Compare: https://github.com/Evolveum/midpoint/compare/ca20dc3d549b%5E...017ef1fa20b5


More information about the midPoint-svn mailing list