Repository: deltaspike Updated Branches: refs/heads/master 4b09512b8 -> a33015198
DELTASPIKE-1125 move config to CoreBaseConfig Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a3301519 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a3301519 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a3301519 Branch: refs/heads/master Commit: a33015198eb6bb9e08eaf9493d30cff635266304 Parents: 4b09512 Author: Mark Struberg <[email protected]> Authored: Tue Apr 19 13:43:51 2016 +0200 Committer: Mark Struberg <[email protected]> Committed: Tue Apr 19 13:43:51 2016 +0200 ---------------------------------------------------------------------- .../core/api/config/base/CoreBaseConfig.java | 10 ++++++++++ .../deltaspike/core/util/ParentExtensionStorage.java | 14 +++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a3301519/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java index 4831315..befd31e 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java @@ -100,4 +100,14 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig .withDefault((int) TimeUnit.MINUTES.toMillis(1)) .getValue(); } + + interface ParentExtensionCustomization + { + Boolean PARENT_EXTENSION_ENABLED = + ConfigResolver.resolve("deltaspike.parent.extension.enabled") + .as(Boolean.class) + .withCurrentProjectStage(true) + .withDefault(Boolean.FALSE) + .getValue(); + } } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a3301519/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java index 00bf3ad..587c39e 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.deltaspike.core.api.config.ConfigResolver; +import org.apache.deltaspike.core.api.config.base.CoreBaseConfig; /** * Support for Containers with 'hierarchic BeanManagers' @@ -42,7 +42,7 @@ import org.apache.deltaspike.core.api.config.ConfigResolver; * * Please note that you need to enable this handling if you are running DeltaSpike * in an EAR on a container which supports parent Extensions. - * You can do that by settting {@link #CONFIG_ENABLE_PARENT_EXTENSION} to "e;true"e; + * You can do that by settting {@code "deltaspike.parent.extension.enabled"} to "e;true"e; * * All your Extension has to do is to register itself in * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery}. @@ -50,13 +50,11 @@ import org.apache.deltaspike.core.api.config.ConfigResolver; * e.g. check which classes got scanned in the parent ClassLoader. * * The ExtensionInfo automatically gets removed if the webapp gets undeployed. + * + * @see org.apache.deltaspike.core.api.config.base.CoreBaseConfig.ParentExtensionCustomization */ public final class ParentExtensionStorage { - /** - * Enable DeltaSpike ParentExtension handling by setting this configuration option to "e;true"e; - */ - public static final String CONFIG_ENABLE_PARENT_EXTENSION = "deltaspike.parent.extension.enabled"; private static Set<ExtensionStorageInfo> extensionStorage = new HashSet<ExtensionStorageInfo>(); @@ -87,9 +85,7 @@ public final class ParentExtensionStorage private static boolean usingParentExtension() { - final boolean usingParentExtension = - Boolean.parseBoolean(ConfigResolver.getPropertyValue(CONFIG_ENABLE_PARENT_EXTENSION)); - return usingParentExtension; + return CoreBaseConfig.ParentExtensionCustomization.PARENT_EXTENSION_ENABLED; } private static void removeAbandonedExtensions()
