You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2017/11/27 15:06:25 UTC

[3/3] deltaspike git commit: DELTASPIKE-1296 move ConfigSource registration

DELTASPIKE-1296 move ConfigSource registration

we now register PropertyFileConfig ConfigSources
already in AfterBeanDiscovery and not in AfterDeploymentValidation.
As requested by Romain


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f0d56be8
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f0d56be8
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f0d56be8

Branch: refs/heads/master
Commit: f0d56be8f4867908c39c1937fdf25fa8d8524c07
Parents: 717771b
Author: Mark Struberg <st...@apache.org>
Authored: Mon Nov 27 16:05:03 2017 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Nov 27 16:05:03 2017 +0100

----------------------------------------------------------------------
 .../deltaspike/core/impl/config/ConfigurationExtension.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f0d56be8/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 4350445..f5be8cc 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
@@ -263,7 +263,7 @@ public class ConfigurationExtension implements Extension, Deactivatable
     }
 
     @SuppressWarnings("UnusedDeclaration")
-    public void registerUserConfigSources(@Observes AfterDeploymentValidation adv)
+    public void registerUserConfigSources(@Observes AfterBeanDiscovery abd)
     {
         if (!isActivated)
         {
@@ -306,13 +306,16 @@ public class ConfigurationExtension implements Extension, Deactivatable
             ConfigResolver.addConfigFilter(BeanProvider.getContextualReference(ConfigFilter.class, bean));
         }
 
-        processConfigurationValidation(adv);
-
         registerConfigMBean();
 
         logConfiguration();
     }
 
+    public void validateConfiguration(@Observes AfterDeploymentValidation adv)
+    {
+        processConfigurationValidation(adv);
+    }
+
     private void logConfiguration()
     {
         Boolean logConfig = ConfigResolver.resolve(ConfigResolver.DELTASPIKE_LOG_CONFIG).as(Boolean.class).getValue();