From 017ef1fa20b5e6ef338be42be98e362b204672cf Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Tue, 10 Dec 2019 17:08:27 +0100 Subject: [PATCH] Migrate to Apache Commons Configuration 2 Currently this does not work because of some POM dependencies. --- build-system/pom.xml | 38 +++++++++---------- gui/admin-gui/pom.xml | 4 +- .../resources/PageResourceVisualization.java | 2 +- .../web/security/MidPointApplication.java | 2 +- .../security/WebApplicationConfiguration.java | 2 +- infra/common/pom.xml | 4 +- .../common/InternalsConfigController.java | 4 +- .../common/LoggingConfigurationManager.java | 2 +- .../api/MidpointConfiguration.java | 2 +- .../api/RuntimeConfiguration.java | 4 +- infra/schema/pom.xml | 4 +- .../schema/internals/InternalsConfig.java | 2 +- model/model-common/pom.xml | 4 +- .../model/common/ConstantsManager.java | 2 +- .../common/expression/ExpressionTestUtil.java | 4 +- model/workflow-impl/pom.xml | 4 +- .../midpoint/wf/impl/WfConfiguration.java | 5 +-- .../impl/processors/BaseChangeProcessor.java | 1 - provisioning/ucf-impl-connid/pom.xml | 4 +- .../connid/ConnectorFactoryConnIdImpl.java | 9 ++--- repo/audit-api/pom.xml | 4 +- .../audit/api/AuditServiceFactory.java | 2 +- repo/audit-impl/pom.xml | 4 +- .../audit/impl/LoggerAuditServiceFactory.java | 2 +- repo/repo-api/pom.xml | 4 +- .../repo/api/RepositoryServiceFactory.java | 2 +- repo/repo-sql-impl-test/pom.xml | 4 +- .../sql/testing/TestSqlRepositoryFactory.java | 3 +- repo/repo-sql-impl/pom.xml | 4 +- .../repo/sql/SqlAuditServiceFactory.java | 10 +++-- .../repo/sql/SqlRepositoryConfiguration.java | 2 +- .../repo/sql/SqlRepositoryFactory.java | 2 +- repo/repo-test-util/pom.xml | 4 +- .../test/DummyAuditServiceFactory.java | 2 +- repo/system-init/pom.xml | 4 +- .../evolveum/midpoint/init/AuditFactory.java | 12 +++--- .../init/ConfigurablePrismContextFactory.java | 2 +- .../init/ConfigurableProtectorFactory.java | 2 +- .../midpoint/init/ProtectorConfiguration.java | 2 +- .../midpoint/init/RepositoryFactory.java | 2 +- .../midpoint/init/StartupConfiguration.java | 28 ++++++++------ .../init/SystemConfigurationSectionImpl.java | 2 +- .../midpoint/init/TestConfigurationLoad.java | 2 +- repo/task-quartz-impl/pom.xml | 4 +- .../task/quartzimpl/NodeIdComputer.java | 2 +- .../quartzimpl/TaskManagerConfiguration.java | 2 +- tools/ninja/pom.xml | 4 +- .../util/InitializationBeanPostprocessor.java | 2 +- 48 files changed, 110 insertions(+), 112 deletions(-) diff --git a/build-system/pom.xml b/build-system/pom.xml index 4a2c609ac3d..a6ade3f5afd 100644 --- a/build-system/pom.xml +++ b/build-system/pom.xml @@ -377,12 +377,12 @@ commons-beanutils commons-beanutils - 1.8.3 + 1.9.4 commons-beanutils commons-beanutils-core - 1.8.3 + 1.9.4 commons-codec @@ -395,23 +395,23 @@ 3.2.2 - commons-configuration - commons-configuration - 1.6 - - - commons-logging - commons-logging - - - commons-digester - commons-digester - - - commons-beanutils - commons-beanutils - - + org.apache.commons + commons-configuration2 + 2.5 + + + + + + + + + + + + + + commons-io diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index 2efdf2cc96c..e6e6700af33 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -710,8 +710,8 @@ commons-codec - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 commons-collections diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java index bedefedb00e..86c7bfb6a9e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java @@ -28,7 +28,7 @@ import com.evolveum.midpoint.web.page.admin.PageAdmin; import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceVisualizationDto; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java index 2901e02f130..7eb897fadc5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java @@ -36,7 +36,7 @@ import com.evolveum.midpoint.repo.cache.CacheRegistry; import com.evolveum.midpoint.web.security.util.SecurityUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.IOUtils; import org.apache.wicket.Component; import org.apache.wicket.ConverterLocator; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java index 6b6b38edb34..40e8f471ebe 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/WebApplicationConfiguration.java @@ -10,7 +10,7 @@ import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import java.io.Serializable; diff --git a/infra/common/pom.xml b/infra/common/pom.xml index 403cfbfc8f4..10fc64bb138 100644 --- a/infra/common/pom.xml +++ b/infra/common/pom.xml @@ -74,8 +74,8 @@ spring-context - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 commons-collections diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java b/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java index 3945d44c358..feee27f3f49 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2018 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 @@ -8,7 +8,7 @@ import javax.annotation.PostConstruct; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration; import com.evolveum.midpoint.schema.internals.InternalsConfig; diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java index a0052ae562f..d762d7d03b6 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java @@ -21,7 +21,7 @@ import com.evolveum.midpoint.util.logging.*; import com.evolveum.midpoint.util.statistics.OperationExecutionLogger; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import org.slf4j.bridge.SLF4JBridgeHandler; diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java index a94307a22e2..28fba0b8c38 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java @@ -6,7 +6,7 @@ */ package com.evolveum.midpoint.common.configuration.api; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.jetbrains.annotations.NotNull; /** diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java index 3827f8aca67..c0ab7fbe8cf 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/RuntimeConfiguration.java @@ -7,12 +7,12 @@ package com.evolveum.midpoint.common.configuration.api; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; public interface RuntimeConfiguration { /** - * Return symbolic name of the component in configuration subsytem. + * Return symbolic name of the component in configuration subsystem. * Samples: *
  • *
      repository -> midpoint.repository
    diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml index 95c30771f20..92d3af72c17 100644 --- a/infra/schema/pom.xml +++ b/infra/schema/pom.xml @@ -143,8 +143,8 @@ commons-lang3 - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 ch.qos.logback diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java index d745168a0d7..8c7f87e861f 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java @@ -6,7 +6,7 @@ */ package com.evolveum.midpoint.schema.internals; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * @author semancik diff --git a/model/model-common/pom.xml b/model/model-common/pom.xml index 6538d68ff8c..fe0357a5993 100644 --- a/model/model-common/pom.xml +++ b/model/model-common/pom.xml @@ -138,8 +138,8 @@ commons-io - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.springframework.security diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java index 8afc05f93de..0223c8123b7 100644 --- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java +++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ConstantsManager.java @@ -6,7 +6,7 @@ */ package com.evolveum.midpoint.model.common; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java index 309a3fe0b65..aa033fa0a49 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java @@ -14,8 +14,8 @@ import com.evolveum.midpoint.prism.crypto.Protector; import com.evolveum.midpoint.prism.crypto.KeyStoreBasedProtectorBuilder; import com.evolveum.midpoint.repo.api.RepositoryService; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; import com.evolveum.midpoint.repo.common.ObjectResolver; import com.evolveum.midpoint.repo.common.expression.ExpressionFactory; diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml index 291a06ba1a7..c84b6086429 100644 --- a/model/workflow-impl/pom.xml +++ b/model/workflow-impl/pom.xml @@ -141,8 +141,8 @@ commons-lang3 - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 javax.annotation diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java index 7154e12077b..84cf9e73e3f 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java @@ -11,11 +11,8 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.wf.impl.processors.ChangeProcessor; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java index 8247919157f..68486070848 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java @@ -11,7 +11,6 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.wf.impl.util.MiscHelper; -import org.apache.commons.configuration.Configuration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/provisioning/ucf-impl-connid/pom.xml b/provisioning/ucf-impl-connid/pom.xml index f1c90bb8aba..0658db94031 100644 --- a/provisioning/ucf-impl-connid/pom.xml +++ b/provisioning/ucf-impl-connid/pom.xml @@ -65,8 +65,8 @@ commons-lang - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.springframework diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java index 42800979deb..f7224da672e 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java @@ -35,7 +35,7 @@ import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.schema.MutablePrismSchema; import com.evolveum.midpoint.util.MiscUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.identityconnectors.common.Version; import org.identityconnectors.common.security.Encryptor; import org.identityconnectors.common.security.EncryptorFactory; @@ -192,10 +192,9 @@ public void initialize() { } // Scan all provided directories - @SuppressWarnings("unchecked") - List dirs = config.getList("scanDirectory"); - for (String dir : dirs) { - bundleURIs.addAll(scanDirectory(dir)); + List dirs = config.getList("scanDirectory"); + for (Object dir : dirs) { + bundleURIs.addAll(scanDirectory(dir.toString())); } for (URI u : bundleURIs) { diff --git a/repo/audit-api/pom.xml b/repo/audit-api/pom.xml index 3e7151eb396..e7231a8152e 100644 --- a/repo/audit-api/pom.xml +++ b/repo/audit-api/pom.xml @@ -39,8 +39,8 @@ 4.1-SNAPSHOT - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 diff --git a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java index c55faf6ffad..e02eb53b7ee 100644 --- a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java +++ b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditServiceFactory.java @@ -7,7 +7,7 @@ package com.evolveum.midpoint.audit.api; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * @author lazyman diff --git a/repo/audit-impl/pom.xml b/repo/audit-impl/pom.xml index 28a9856dd2c..e733a8aee1f 100644 --- a/repo/audit-impl/pom.xml +++ b/repo/audit-impl/pom.xml @@ -60,8 +60,8 @@ 4.1-SNAPSHOT - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.springframework diff --git a/repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java b/repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java index dab80f828cd..5e191d6aa8f 100644 --- a/repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java +++ b/repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java @@ -10,7 +10,7 @@ import com.evolveum.midpoint.audit.api.AuditService; import com.evolveum.midpoint.audit.api.AuditServiceFactory; import com.evolveum.midpoint.audit.api.AuditServiceFactoryException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * @author lazyman diff --git a/repo/repo-api/pom.xml b/repo/repo-api/pom.xml index 580dcf1df01..2173292aa85 100644 --- a/repo/repo-api/pom.xml +++ b/repo/repo-api/pom.xml @@ -43,8 +43,8 @@ commons-lang - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.jetbrains diff --git a/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java b/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java index 5b1f587a5ee..a8d0dbdf7f9 100644 --- a/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java +++ b/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java @@ -7,7 +7,7 @@ package com.evolveum.midpoint.repo.api; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; public interface RepositoryServiceFactory { diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml index 4213a1664e6..d64ed38c36a 100644 --- a/repo/repo-sql-impl-test/pom.xml +++ b/repo/repo-sql-impl-test/pom.xml @@ -71,8 +71,8 @@ commons-lang - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 diff --git a/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java b/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java index 4533eda37f4..6cffbed1890 100644 --- a/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java +++ b/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java @@ -7,12 +7,11 @@ package com.evolveum.midpoint.repo.sql.testing; -import com.evolveum.midpoint.repo.api.RepositoryService; import com.evolveum.midpoint.repo.api.RepositoryServiceFactoryException; import com.evolveum.midpoint.repo.sql.SqlRepositoryFactory; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import java.io.File; diff --git a/repo/repo-sql-impl/pom.xml b/repo/repo-sql-impl/pom.xml index 60ee176892f..499728a2570 100644 --- a/repo/repo-sql-impl/pom.xml +++ b/repo/repo-sql-impl/pom.xml @@ -126,8 +126,8 @@ commons-codec - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.apache.commons diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java index 8144eac155a..409f1e6bce1 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java @@ -17,8 +17,10 @@ import java.util.List; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.SubnodeConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.lang.StringUtils; /** @@ -60,8 +62,8 @@ public synchronized void init(Configuration config) throws AuditServiceFactoryEx try { repositoryFactory.init(config); auditService = new SqlAuditServiceImpl(repositoryFactory); - List subConfigColumns = ((SubnodeConfiguration)config).configurationsAt(CONF_AUDIT_SERVICE_COLUMNS); - for(SubnodeConfiguration subConfigColumn : subConfigColumns) { + List> subConfigColumns = ((BaseHierarchicalConfiguration)config).childConfigurationsAt(CONF_AUDIT_SERVICE_COLUMNS); + for(Configuration subConfigColumn : subConfigColumns) { String columnName = getStringFromConfig(subConfigColumn, CONF_AUDIT_SERVICE_COLUMN_NAME); String eventRecordPropertyName = getStringFromConfig(subConfigColumn, CONF_AUDIT_SERVICE_EVENT_RECORD_PROPERTY_NAME); auditService.getCustomColumn().put(eventRecordPropertyName, columnName); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java index 916a28b099a..7dfc80046f1 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java @@ -15,7 +15,7 @@ import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.h2.Driver; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java index 5acc99b4e10..a85faf03fd5 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java @@ -13,7 +13,7 @@ import com.evolveum.midpoint.repo.sql.perf.SqlPerformanceMonitorImpl; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; diff --git a/repo/repo-test-util/pom.xml b/repo/repo-test-util/pom.xml index b64038baf9a..5e3d8ec6c4d 100644 --- a/repo/repo-test-util/pom.xml +++ b/repo/repo-test-util/pom.xml @@ -98,8 +98,8 @@ commons-collections4 - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.springframework.security diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditServiceFactory.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditServiceFactory.java index 6c78dee31ba..a50ede6fdd0 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditServiceFactory.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditServiceFactory.java @@ -6,7 +6,7 @@ */ package com.evolveum.midpoint.test; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import com.evolveum.midpoint.audit.api.AuditService; import com.evolveum.midpoint.audit.api.AuditServiceFactory; diff --git a/repo/system-init/pom.xml b/repo/system-init/pom.xml index 4e2ae678086..8a433d57a1b 100644 --- a/repo/system-init/pom.xml +++ b/repo/system-init/pom.xml @@ -106,8 +106,8 @@ commons-io - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.springframework diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java index f33593a0c5e..fc26538c3f2 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditFactory.java @@ -15,7 +15,8 @@ import com.evolveum.midpoint.util.logging.LoggingUtils; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.*; +import org.apache.commons.configuration2.*; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; @@ -41,12 +42,9 @@ public class AuditFactory implements ApplicationContextAware, RuntimeConfigurati public void init() { Configuration config = getCurrentConfiguration(); - //TODO FIX CONFIGURATION, CLEANUP REALLY NEEDED - List auditServices = ((XMLConfiguration) ((CompositeConfiguration) - ((SubsetConfiguration) config).getParent()).getConfiguration(0)) - .configurationsAt(MidpointConfiguration.AUDIT_CONFIGURATION + "." + CONF_AUDIT_SERVICE); - - for (SubnodeConfiguration serviceConfig : auditServices) { + List> auditServices = + ((BaseHierarchicalConfiguration) config).childConfigurationsAt(CONF_AUDIT_SERVICE); + for (Configuration serviceConfig : auditServices) { try { String factoryClass = getFactoryClassName(serviceConfig); Class clazz = (Class) Class.forName(factoryClass); diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java index 94a8d043762..b7345f85b8c 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java @@ -13,7 +13,7 @@ import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import java.io.File; diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java index f32148a3455..ea95ade8a37 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java @@ -14,7 +14,7 @@ import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ProtectorConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ProtectorConfiguration.java index 614c38d4d26..0842d35d624 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ProtectorConfiguration.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ProtectorConfiguration.java @@ -7,7 +7,7 @@ package com.evolveum.midpoint.init; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * @author lazyman diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java index 2325b16a186..4d3a3cec670 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java @@ -6,7 +6,7 @@ */ package com.evolveum.midpoint.init; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java index 1810e151b16..a3286cde0b3 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java @@ -20,10 +20,12 @@ import com.evolveum.midpoint.util.logging.LoggingUtils; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import org.apache.commons.configuration.CompositeConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.XMLConfiguration; +import org.apache.commons.configuration2.CompositeConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; @@ -113,7 +115,6 @@ private void applyMidpointHome(Configuration sub) { if (getMidpointHome() != null) { sub.addProperty(MIDPOINT_HOME_PROPERTY, getMidpointHome()); } else { - @SuppressWarnings("unchecked") Iterator i = sub.getKeys(); while (i.hasNext()) { String key = i.next(); @@ -126,7 +127,6 @@ private void applyMidpointHome(Configuration sub) { private void dumpConfiguration(String componentName, Configuration sub) { if (LOGGER.isDebugEnabled()) { LOGGER.debug("Configuration for {} :", componentName); - @SuppressWarnings("unchecked") Iterator i = sub.getKeys(); while (i.hasNext()) { String key = i.next(); @@ -192,7 +192,7 @@ private void loadConfiguration(@NotNull File midpointHome) { config.clear(); } else { config = new CompositeConfiguration(); - config.setDelimiterParsingDisabled(true); +// config.setDelimiterParsingDisabled(true); } DocumentBuilder documentBuilder = DOMUtil.createDocumentBuilder(); // we need namespace-aware document builder (see GeneralChangeProcessor.java) @@ -276,11 +276,15 @@ private void setupInitialLoggingFromHomeDirectory(File midpointHome) { } private void createXmlConfiguration(DocumentBuilder documentBuilder, String filename) throws ConfigurationException { - XMLConfiguration xmlConfig = new XMLConfiguration(); - xmlConfig.setDocumentBuilder(documentBuilder); - xmlConfig.setDelimiterParsingDisabled(true); - xmlConfig.setFileName(filename); - xmlConfig.load(); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder<>(XMLConfiguration.class) + .configure( + new Parameters() + .xml() + .setFileName(filename) + .setDocumentBuilder(documentBuilder) + ); + XMLConfiguration xmlConfig = builder.getConfiguration(); config.addConfiguration(xmlConfig); applyEnvironmentProperties(); resolveFileReferences(); diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/SystemConfigurationSectionImpl.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/SystemConfigurationSectionImpl.java index 839e3c455b2..ea5dfd9d577 100644 --- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/SystemConfigurationSectionImpl.java +++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/SystemConfigurationSectionImpl.java @@ -9,7 +9,7 @@ import com.evolveum.midpoint.common.configuration.api.SystemConfigurationSection; import com.evolveum.midpoint.schema.constants.MidPointConstants; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * diff --git a/repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java b/repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java index c9ad1cf9c3d..5b695e1fc4d 100644 --- a/repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java +++ b/repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java @@ -16,7 +16,7 @@ import java.util.Iterator; import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.Test; import com.evolveum.midpoint.test.util.TestUtil; diff --git a/repo/task-quartz-impl/pom.xml b/repo/task-quartz-impl/pom.xml index ced05f4933b..7fdb14ab072 100644 --- a/repo/task-quartz-impl/pom.xml +++ b/repo/task-quartz-impl/pom.xml @@ -77,8 +77,8 @@ commons-collections4 - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 commons-logging diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java index 36f21f2afd9..df734fd092c 100644 --- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java +++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java @@ -25,7 +25,7 @@ import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.util.template.*; import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java index e4cfd7a7f94..6d40164bc65 100644 --- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java +++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java @@ -16,7 +16,7 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskExecutionLimitationsType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/tools/ninja/pom.xml b/tools/ninja/pom.xml index 87d59572ea2..056417a22e1 100644 --- a/tools/ninja/pom.xml +++ b/tools/ninja/pom.xml @@ -191,8 +191,8 @@ commons-codec - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 javax.xml.ws diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/InitializationBeanPostprocessor.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/InitializationBeanPostprocessor.java index 1498ab5c9b5..191dd5efa84 100644 --- a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/InitializationBeanPostprocessor.java +++ b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/InitializationBeanPostprocessor.java @@ -8,7 +8,7 @@ import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration; import com.evolveum.midpoint.repo.sql.SqlRepositoryConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor;