Add DefaultWeb as a static resource unless configuration specifies otherwise
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/090114d0 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/090114d0 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/090114d0 Branch: refs/heads/master Commit: 090114d0ace7da6c90c94a23b0d21c89443fae0c Parents: 299633d Author: Carlos Sierra <[email protected]> Authored: Fri Oct 6 11:53:19 2017 +0200 Committer: Carlos Sierra <[email protected]> Committed: Fri Oct 6 11:59:29 2017 +0200 ---------------------------------------------------------------------- .../jax/rs/whiteboard/internal/Whiteboard.java | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/090114d0/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java index 7af9ec2..7a9d179 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java @@ -60,6 +60,7 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; import java.util.function.Function; @@ -419,7 +420,27 @@ public class Whiteboard { return properties; }).flatMap(properties -> register( - Application.class, new DefaultApplication(), properties)); + Application.class, + new DefaultApplication() { + + @Override + public Set<Object> getSingletons() { + Object defaultApplication = _configurationMap.get( + "org.apache.aries.jax.rs.whiteboard.default." + + "application"); + + if (defaultApplication == null || + Boolean.parseBoolean(defaultApplication.toString())) { + + return Collections.singleton(new DefaultWeb()); + } + else { + return Collections.emptySet(); + } + } + + }, + properties)); } private ServiceRegistration<?>
