You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/11/29 10:56:47 UTC
[1/3] aries-jax-rs-whiteboard git commit: Source cleaning
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master ede757ba6 -> 9ad23b7fa
Source cleaning
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/9ad23b7f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/9ad23b7f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/9ad23b7f
Branch: refs/heads/master
Commit: 9ad23b7fa31fb82061fc0cdbad87aaee19d58906
Parents: d6bdf4f
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 29 11:21:39 2017 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 29 11:22:01 2017 +0100
----------------------------------------------------------------------
.../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9ad23b7f/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 23d25da..9b36661 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
@@ -37,7 +37,6 @@ import org.osgi.service.http.context.ServletContextHelper;
import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.container.DynamicFeature;
[3/3] aries-jax-rs-whiteboard git commit: Use effects primitive
Posted by cs...@apache.org.
Use effects primitive
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/43acc44f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/43acc44f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/43acc44f
Branch: refs/heads/master
Commit: 43acc44f019e03419ad217baaef358c159b3d5d7
Parents: ede757b
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 29 11:19:39 2017 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 29 11:22:01 2017 +0100
----------------------------------------------------------------------
.../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/43acc44f/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 9eed2be..4426e93 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
@@ -653,10 +653,9 @@ public class Whiteboard {
}
return
- just(0).
effects(
- __ -> onWaiting.accept(serviceReference),
- __ -> onResolved.accept(serviceReference)).then(
+ () -> onWaiting.accept(serviceReference),
+ () -> onResolved.accept(serviceReference)).then(
serviceReferences(
CXFJaxRsServiceRegistrator.class,
applicationSelectProperty.toString()).
[2/3] aries-jax-rs-whiteboard git commit: Support builin extensions
(151.5.4)
Posted by cs...@apache.org.
Support builin extensions (151.5.4)
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/d6bdf4ff
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d6bdf4ff
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d6bdf4ff
Branch: refs/heads/master
Commit: d6bdf4ff3e69c2aa723889293f44d7ad7a9ee2d6
Parents: 43acc44
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Nov 29 11:21:15 2017 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Wed Nov 29 11:22:01 2017 +0100
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/Whiteboard.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d6bdf4ff/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 4426e93..23d25da 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
@@ -196,8 +196,7 @@ public class Whiteboard {
_runtime::removeApplicationDependentExtension).
flatMap(registratorReference ->
waitForExtensionDependencies(
- resourceReference,
- getApplicationName(registratorReference::getProperty),
+ resourceReference, registratorReference,
_runtime::addDependentExtension,
_runtime::removeDependentExtension).
then(
@@ -215,8 +214,7 @@ public class Whiteboard {
_runtime::removeApplicationDependentResource).
flatMap(registratorReference ->
waitForExtensionDependencies(
- resourceReference,
- getApplicationName(registratorReference::getProperty),
+ resourceReference, registratorReference,
_runtime::addDependentService,
_runtime::removeDependentService).
then(
@@ -570,10 +568,15 @@ public class Whiteboard {
}
private OSGi<?> waitForExtensionDependencies(
- CachingServiceReference<?> serviceReference, String applicationName,
+ CachingServiceReference<?> serviceReference,
+ CachingServiceReference<CXFJaxRsServiceRegistrator>
+ applicationRegistratorReference,
Consumer<CachingServiceReference<?>> onAddingDependent,
Consumer<CachingServiceReference<?>> onRemovingDependent) {
+ String applicationName = getApplicationName(
+ applicationRegistratorReference::getProperty);
+
String[] extensionDependencies = canonicalize(
serviceReference.getProperty(JAX_RS_EXTENSION_SELECT));
@@ -594,6 +597,14 @@ public class Whiteboard {
Filter extensionFilter = _bundleContext.createFilter(
extensionDependency);
+ if (
+ extensionFilter.match(_runtimeReference) ||
+ extensionFilter.match(
+ applicationRegistratorReference.getServiceReference())) {
+
+ continue;
+ }
+
program =
once(serviceReferences(ApplicationExtensionRegistration.class).
filter(