You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by rm...@apache.org on 2017/11/29 09:56:55 UTC
deltaspike git commit: DELTASPIKE-1296 fixing configuration extension
lifecycle
Repository: deltaspike
Updated Branches:
refs/heads/master f0d56be8f -> 5685edbf5
DELTASPIKE-1296 fixing configuration extension lifecycle
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5685edbf
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5685edbf
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5685edbf
Branch: refs/heads/master
Commit: 5685edbf58e42baa285198f9b6244d88b82ff7bf
Parents: f0d56be
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Wed Nov 29 10:56:44 2017 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Wed Nov 29 10:56:44 2017 +0100
----------------------------------------------------------------------
.../core/impl/config/ConfigurationExtension.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5685edbf/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
index f5be8cc..2d958c2 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
@@ -292,13 +292,20 @@ public class ConfigurationExtension implements Extension, Deactivatable
{
configSources.addAll(createPropertyConfigSource(propertyFileConfigClass));
}
+ ConfigResolver.addConfigSources(configSources);
+
+ registerConfigMBean();
+
+ logConfiguration();
+ }
+ public void validateConfiguration(@Observes AfterDeploymentValidation adv)
+ {
+ List<ConfigSource> configSources = new ArrayList<ConfigSource>(cdiSources.size());
for (final Bean bean : cdiSources)
{
configSources.add(BeanProvider.getContextualReference(ConfigSource.class, bean));
}
-
- // finally add all
ConfigResolver.addConfigSources(configSources);
for (final Bean bean : cdiFilters)
@@ -306,13 +313,6 @@ public class ConfigurationExtension implements Extension, Deactivatable
ConfigResolver.addConfigFilter(BeanProvider.getContextualReference(ConfigFilter.class, bean));
}
- registerConfigMBean();
-
- logConfiguration();
- }
-
- public void validateConfiguration(@Observes AfterDeploymentValidation adv)
- {
processConfigurationValidation(adv);
}