Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master 7893ea160 -> ee69fc90d
move client builder and default web to root Signed-off-by: Raymond Auge <[email protected]> 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/ee69fc90 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ee69fc90 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ee69fc90 Branch: refs/heads/master Commit: ee69fc90d35b68012535631bb2b2a068cd10c772 Parents: 7893ea1 Author: Raymond Auge <[email protected]> Authored: Sun Jul 2 20:54:47 2017 -0400 Committer: Raymond Auge <[email protected]> Committed: Thu Aug 3 12:40:55 2017 -0400 ---------------------------------------------------------------------- .../jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java | 5 ++++- .../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee69fc90/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java index c57e9d0..78eb125 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java @@ -20,8 +20,10 @@ package org.apache.aries.jax.rs.whiteboard.activator; import java.util.Dictionary; import java.util.Hashtable; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.ext.RuntimeDelegate; +import org.apache.aries.jax.rs.whiteboard.internal.ClientBuilderFactory; import org.apache.aries.jax.rs.whiteboard.internal.DefaultWeb; import org.apache.aries.jax.rs.whiteboard.internal.Maps; import org.apache.aries.osgi.functional.OSGi; @@ -74,7 +76,8 @@ public class CXFJaxRsBundleActivator implements BundleActivator { Constants.SERVICE_PID, "org.apache.aries.jax.rs.whiteboard.default"); _defaultOSGiResult = - createWhiteboard(defaultConfiguration).then( + register(ClientBuilder.class, new ClientBuilderFactory(), null).then( + createWhiteboard(defaultConfiguration)).then( registerDefaultWeb() ).run(bundleContext); } http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee69fc90/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 882c45f..0f71906 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 @@ -30,7 +30,6 @@ import org.osgi.service.http.runtime.HttpServiceRuntime; import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime; import javax.servlet.Servlet; -import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Application; import java.util.ArrayList; import java.util.Collection; @@ -79,8 +78,7 @@ public class Whiteboard { whiteboardApplications(bus), whiteBoardApplicationSingletons(), whiteboardExtensions(defaultServiceRegistrator), - whiteboardSingletons(defaultServiceRegistrator), - register(ClientBuilder.class, new ClientBuilderFactory(), null) + whiteboardSingletons(defaultServiceRegistrator) )))); }
