Deploy extensions in default application
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/14c49ecd Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/14c49ecd Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/14c49ecd Branch: refs/heads/new-spec-with-component-dsl Commit: 14c49ecd551d4a407a722c7644a5493c04858031 Parents: d425d5d Author: Carlos Sierra <[email protected]> Authored: Wed Feb 22 17:44:39 2017 +0100 Committer: Carlos Sierra <[email protected]> Committed: Wed Feb 22 17:49:47 2017 +0100 ---------------------------------------------------------------------- jax-rs.itests/src/main/java/test/JaxrsTest.java | 4 +-- .../activator/CXFJaxRsBundleActivator.java | 31 ++++++-------------- 2 files changed, 11 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/14c49ecd/jax-rs.itests/src/main/java/test/JaxrsTest.java ---------------------------------------------------------------------- diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java index 5292cfd..3fc9c52 100644 --- a/jax-rs.itests/src/main/java/test/JaxrsTest.java +++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java @@ -184,7 +184,7 @@ public class JaxrsTest { "osgi.jaxrs.resource.base", "/test-addon"); filterRegistration = registerFilter( - "osgi.jaxrs.filter.base", "/test-addon"); + "osgi.jaxrs.extension.name", "test-filter"); Response response = webTarget.request().get(); @@ -231,7 +231,7 @@ public class JaxrsTest { assertNull(response.getHeaders().getFirst("Filtered")); filterRegistration = registerFilter( - "osgi.jaxrs.filter.base", "/test-addon"); + "osgi.jaxrs.extension.name", "test-filter"); response = webTarget.request().get(); http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/14c49ecd/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 e40b991..4260db0 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 @@ -59,7 +59,7 @@ public class CXFJaxRsBundleActivator implements BundleActivator { private BundleContext _bundleContext; private OSGiResult<?> _applicationsResult; private OSGiResult<?> _singletonsResult; - private OSGiResult<?> _filtersResult; + private OSGiResult<?> _extensionsResult; private static <T> OSGi<T> service(ServiceReference<T> serviceReference) { return @@ -127,27 +127,14 @@ public class CXFJaxRsBundleActivator implements BundleActivator { _singletonsResult = singletons.run(bundleContext); - OSGi<?> filters = - serviceReferences(getFiltersFilter()).flatMap(ref -> + OSGi<?> extensions = + serviceReferences(getExtensionFilter()).flatMap(ref -> waitForExtensionDependencies(ref, - just( - ref.getProperty("osgi.jaxrs.filter.base").toString()). - flatMap(filterBase -> - serviceReferences( - CXFJaxRsServiceRegistrator.class, "(CXF_ENDPOINT_ADDRESS=*)"). - filter(regref -> - regref. - getProperty("CXF_ENDPOINT_ADDRESS"). - toString(). - startsWith(filterBase)). - flatMap(regref -> - service(regref).flatMap(registrator -> - service(ref).flatMap(service -> - safeRegisterEndpoint(ref, registrator, service) - ))))) + safeRegisterEndpoint(ref, defaultServiceRegistrator) + ) ); - _filtersResult = filters.run(bundleContext); + _extensionsResult = extensions.run(bundleContext); } /** @@ -260,8 +247,8 @@ public class CXFJaxRsBundleActivator implements BundleActivator { return cxfNonSpringServlet; } - private String getFiltersFilter() { - return "(osgi.jaxrs.filter.base=*)"; + private String getExtensionFilter() { + return "(osgi.jaxrs.extension.name=*)"; } private String getApplicationFilter() { @@ -275,7 +262,7 @@ public class CXFJaxRsBundleActivator implements BundleActivator { @Override public void stop(BundleContext context) throws Exception { _applicationsResult.close(); - _filtersResult.close(); + _extensionsResult.close(); _singletonsResult.close(); }
