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 2018/07/27 09:57:18 UTC
[1/3] aries-jax-rs-whiteboard git commit: Update version resolution
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 85a5b12b5 -> 3ffc07222
Update version resolution
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/d5e624e7
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d5e624e7
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d5e624e7
Branch: refs/heads/master
Commit: d5e624e7378174d8c5eb6b683040f373a1d2b5c9
Parents: 85a5b12
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jul 27 10:22:15 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jul 27 10:22:15 2018 +0200
----------------------------------------------------------------------
jax-rs.itests-jaxb-json/itest.bndrun | 10 +++++-----
jax-rs.itests/itest.bndrun | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d5e624e7/jax-rs.itests-jaxb-json/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/itest.bndrun b/jax-rs.itests-jaxb-json/itest.bndrun
index 123a527..7409868 100644
--- a/jax-rs.itests-jaxb-json/itest.bndrun
+++ b/jax-rs.itests-jaxb-json/itest.bndrun
@@ -56,9 +56,9 @@
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
- org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.itests-fragment;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.itests-jaxb-json;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.jaxb.json;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.0,1.0.1)'
+ org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.itests-fragment;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.itests-jaxb-json;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.jaxb.json;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.1,1.0.2)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d5e624e7/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index beecd60..2210890 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -54,9 +54,9 @@
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
- org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.itests;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.itests-fragment;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.0,1.0.1)'
+ org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.itests;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.itests-fragment;version='[1.0.1,1.0.2)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.1,1.0.2)'
-include: -personal.bnd
\ No newline at end of file
[2/3] aries-jax-rs-whiteboard git commit: [ARIES-1821] Use prototype
scope
Posted by cs...@apache.org.
[ARIES-1821] Use prototype scope
HTTP Whiteboard spec recommends using prototype scope when registering
servlets and filters to prevent several init/destroy calls to the same
servlet/filter instance.
Also avoid CXFNonSpringServlet to destroy a bus whose lifecycle it does
not own.
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/96ce3a2e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/96ce3a2e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/96ce3a2e
Branch: refs/heads/master
Commit: 96ce3a2ec84ef5054efe3645e71088198c32e543
Parents: d5e624e
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jul 27 11:38:21 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jul 27 11:38:21 2018 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/Whiteboard.java | 30 ++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/96ce3a2e/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 73c90c9..6f95123 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
@@ -33,6 +33,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.PrototypeServiceFactory;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.wiring.BundleWiring;
@@ -1151,8 +1152,16 @@ public class Whiteboard {
}
private static CXFNonSpringServlet createCXFServlet(Bus bus) {
- CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
+ CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet() {
+
+ @Override
+ public void destroyBus() {
+ }
+
+ };
+
cxfNonSpringServlet.setBus(bus);
+
return cxfNonSpringServlet;
}
@@ -1277,7 +1286,24 @@ public class Whiteboard {
return program.then(
register(
- Servlet.class, () -> createCXFServlet(bus),
+ Servlet.class,
+ new PrototypeServiceFactory<Servlet>() {
+ @Override
+ public Servlet getService(
+ Bundle bundle,
+ ServiceRegistration<Servlet> registration) {
+
+ return createCXFServlet(bus);
+ }
+
+ @Override
+ public void ungetService(
+ Bundle bundle,
+ ServiceRegistration<Servlet> registration,
+ Servlet service) {
+
+ }
+ },
servletPropertiesSup));
}
[3/3] aries-jax-rs-whiteboard git commit: Apply count as the latest
effect
Posted by cs...@apache.org.
Apply count as the latest effect
Also simplify the logic
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/3ffc0722
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/3ffc0722
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/3ffc0722
Branch: refs/heads/master
Commit: 3ffc07222f22f343c339d0245b0e12624d1a494c
Parents: 96ce3a2
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jul 27 11:41:17 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jul 27 11:44:15 2018 +0200
----------------------------------------------------------------------
.../aries/jax/rs/whiteboard/internal/Whiteboard.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3ffc0722/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 6f95123..519654f 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
@@ -259,11 +259,13 @@ public class Whiteboard {
return
highestPer(
sr -> just(getServiceName(sr::getProperty)),
- all(
- countChanges(getResourcesForWhiteboard(), _counter),
- countChanges(
- getApplicationExtensionsForWhiteboard(), _counter),
- countChanges(applicationsForWhiteboard, _counter)
+ countChanges(
+ all(
+ getResourcesForWhiteboard(),
+ getApplicationExtensionsForWhiteboard(),
+ applicationsForWhiteboard
+ ),
+ _counter
),
this::registerShadowedService,
this::unregisterShadowedService
@@ -1146,7 +1148,9 @@ public class Whiteboard {
OSGi<T> program, ChangeCounter counter) {
return program.effects(
+ __ -> {},
__ -> counter.inc(),
+ __ -> {},
__ -> counter.inc()
);
}