[midPoint-git] [Evolveum/midpoint] b95e40: Rework node ID generation to Apache Conf 2.6
mederly
noreply at github.com
Wed Dec 11 18:45:35 UTC 2019
Branch: refs/heads/tmp/configuration2
Home: https://github.com/Evolveum/midpoint
Commit: b95e40e4f5338272fc4f716705584bed154e2541
https://github.com/Evolveum/midpoint/commit/b95e40e4f5338272fc4f716705584bed154e2541
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-12-11 (Wed, 11 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/boot/AbstractSpringBootApplication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/test/TestMidPointSpringApplication.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
M infra/common/src/test/java/com/evolveum/midpoint/common/LocalizationTest.java
M infra/util/pom.xml
A infra/util/src/main/java/com/evolveum/midpoint/util/NetworkUtil.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/AbstractChainedResolver.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/JavaPropertiesResolver.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/MapResolver.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/OsEnvironmentResolver.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/ReferenceResolver.java
A infra/util/src/main/java/com/evolveum/midpoint/util/template/StringSubstitutorUtil.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/TemplateEngine.java
R infra/util/src/main/java/com/evolveum/midpoint/util/template/TemplateResolution.java
A infra/util/src/test/java/com/evolveum/midpoint/util/TestStringSubstitutorUtil.java
R infra/util/src/test/java/com/evolveum/midpoint/util/TestTemplateEngine.java
M infra/util/testng-unit.xml
M model/model-impl/pom.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ExtensionSchemaRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportJasperCreateTaskHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.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/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.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/StartupConfiguration.java
A repo/system-init/src/main/java/com/evolveum/midpoint/init/interpol/HostnameLookup.java
A repo/system-init/src/main/java/com/evolveum/midpoint/init/interpol/RandomLookup.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 repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.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/tracing/TracerImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java
M tools/midpoint-war-layout/src/main/java/com/evolveum/midpoint/tools/layout/MidPointWarLauncher.java
M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/NinjaContext.java
Log Message:
-----------
Rework node ID generation to Apache Conf 2.6
Fixed pom.xml changes related to Apache Commons Configuration 2.6.
Cleaned up ApplicationHomeSetup and StartupConfiguration code.
Fixed handling of midpoint.home throughout midPoint code.
Removed TemplateEngine. It had a sad short life, really. Replaced with
StringSubstitutor and ConfigurationInterpolator calls.
This should (finally) resolve MID-5904.
More information about the midPoint-svn
mailing list