You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2018/09/05 16:05:50 UTC
aries-jax-rs-whiteboard git commit: Add Provide-Capabilities
advertising the integration services,
including fixed properties for identification
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 81643717c -> 2de73abe4
Add Provide-Capabilities advertising the integration services, including fixed properties for identification
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/2de73abe
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/2de73abe
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/2de73abe
Branch: refs/heads/master
Commit: 2de73abe46d1bb3a10f93c3d34e5d44a2aedad15
Parents: 8164371
Author: Tim Ward <ti...@apache.org>
Authored: Wed Sep 5 17:05:40 2018 +0100
Committer: Tim Ward <ti...@apache.org>
Committed: Wed Sep 5 17:05:40 2018 +0100
----------------------------------------------------------------------
integrations/jackson/jackson-jaxrs/bnd.bnd | 2 ++
integrations/shiro/shiro-authc/bnd.bnd | 4 +++-
.../jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java | 6 ++----
integrations/shiro/shiro-authz/bnd.bnd | 4 +++-
.../jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java | 2 ++
5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2de73abe/integrations/jackson/jackson-jaxrs/bnd.bnd
----------------------------------------------------------------------
diff --git a/integrations/jackson/jackson-jaxrs/bnd.bnd b/integrations/jackson/jackson-jaxrs/bnd.bnd
index f303122..81fd81e 100644
--- a/integrations/jackson/jackson-jaxrs/bnd.bnd
+++ b/integrations/jackson/jackson-jaxrs/bnd.bnd
@@ -18,3 +18,5 @@
Bundle-Activator: org.apache.aries.jax.rs.jackson.JaxbJsonBundleActivator
-contract: *
+
+Provide-Capability: osgi.service;objectclass:List<String>="javax.ws.rs.ext.MessageBodyReader,javax.ws.rs.ext.MessageBodyWriter";osgi.jaxrs.media.type=application/json
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2de73abe/integrations/shiro/shiro-authc/bnd.bnd
----------------------------------------------------------------------
diff --git a/integrations/shiro/shiro-authc/bnd.bnd b/integrations/shiro/shiro-authc/bnd.bnd
index b84fda6..8bbeb8c 100644
--- a/integrations/shiro/shiro-authc/bnd.bnd
+++ b/integrations/shiro/shiro-authc/bnd.bnd
@@ -24,4 +24,6 @@ Conditional-Package: org.apache.aries.component.dsl.*
-contract: *
-Bundle-Activator: org.apache.aries.jax.rs.shiro.authc.impl.ShiroAuthenticationActivator
\ No newline at end of file
+Bundle-Activator: org.apache.aries.jax.rs.shiro.authc.impl.ShiroAuthenticationActivator
+
+Provide-Capability: osgi.service;objectclass:List<String>="javax.ws.rs.core.Feature";osgi.jaxrs.name=aries.shiro.authc
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2de73abe/integrations/shiro/shiro-authc/src/main/java/org/apache/aries/jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java
----------------------------------------------------------------------
diff --git a/integrations/shiro/shiro-authc/src/main/java/org/apache/aries/jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java b/integrations/shiro/shiro-authc/src/main/java/org/apache/aries/jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java
index ad6f599..d349f29 100644
--- a/integrations/shiro/shiro-authc/src/main/java/org/apache/aries/jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java
+++ b/integrations/shiro/shiro-authc/src/main/java/org/apache/aries/jax/rs/shiro/authc/impl/ShiroAuthenticationActivator.java
@@ -25,21 +25,18 @@ import static org.apache.aries.component.dsl.OSGi.service;
import static org.apache.aries.component.dsl.OSGi.serviceReferences;
import static org.apache.aries.component.dsl.Utils.accumulate;
import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
-import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
import javax.ws.rs.core.Feature;
-import org.apache.aries.component.dsl.CachingServiceReference;
import org.apache.aries.component.dsl.OSGi;
import org.apache.aries.component.dsl.OSGiResult;
-import org.apache.aries.component.dsl.Utils;
import org.apache.shiro.realm.Realm;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -90,6 +87,7 @@ public class ShiroAuthenticationActivator implements BundleActivator {
}
serviceProps.put(JAX_RS_EXTENSION, TRUE);
+ serviceProps.putIfAbsent(JAX_RS_NAME, "aries.shiro.authc");
_LOG.debug("Shiro JAX-RS Authentication Feature service properties are: {}", serviceProps);
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2de73abe/integrations/shiro/shiro-authz/bnd.bnd
----------------------------------------------------------------------
diff --git a/integrations/shiro/shiro-authz/bnd.bnd b/integrations/shiro/shiro-authz/bnd.bnd
index a29ec70..5092401 100644
--- a/integrations/shiro/shiro-authz/bnd.bnd
+++ b/integrations/shiro/shiro-authz/bnd.bnd
@@ -24,4 +24,6 @@ Conditional-Package: org.apache.aries.component.dsl.*
-contract: *
-Bundle-Activator: org.apache.aries.jax.rs.shiro.authz.impl.ShiroAuthorizationActivator
\ No newline at end of file
+Bundle-Activator: org.apache.aries.jax.rs.shiro.authz.impl.ShiroAuthorizationActivator
+
+Provide-Capability: osgi.service;objectclass:List<String>="javax.ws.rs.core.Feature";osgi.jaxrs.name=aries.shiro.authz
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2de73abe/integrations/shiro/shiro-authz/src/main/java/org/apache/aries/jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java
----------------------------------------------------------------------
diff --git a/integrations/shiro/shiro-authz/src/main/java/org/apache/aries/jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java b/integrations/shiro/shiro-authz/src/main/java/org/apache/aries/jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java
index 06476df..07408d7 100644
--- a/integrations/shiro/shiro-authz/src/main/java/org/apache/aries/jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java
+++ b/integrations/shiro/shiro-authz/src/main/java/org/apache/aries/jax/rs/shiro/authz/impl/ShiroAuthorizationActivator.java
@@ -22,6 +22,7 @@ import static org.apache.aries.component.dsl.OSGi.configuration;
import static org.apache.aries.component.dsl.OSGi.just;
import static org.apache.aries.component.dsl.OSGi.register;
import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
import java.util.Dictionary;
import java.util.Enumeration;
@@ -81,6 +82,7 @@ public class ShiroAuthorizationActivator implements BundleActivator {
}
serviceProps.put(JAX_RS_EXTENSION, TRUE);
+ serviceProps.putIfAbsent(JAX_RS_NAME, "aries.shiro.authz");
_LOG.debug("Shiro JAX-RS Authorization Feature service properties are: {}", serviceProps);
return serviceProps;