cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf-dosgi git commit: [DOSGI-266] Support for ContextProvider
Date Mon, 08 May 2017 15:44:28 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 87ead40c8 -> 691014f89


[DOSGI-266] Support for ContextProvider


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/691014f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/691014f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/691014f8

Branch: refs/heads/master
Commit: 691014f8918af1564003923237c206652df1dfd7
Parents: 87ead40
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon May 8 17:44:22 2017 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon May 8 17:44:22 2017 +0200

----------------------------------------------------------------------
 provider-rs/pom.xml                                            | 6 ++++++
 .../org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/691014f8/provider-rs/pom.xml
----------------------------------------------------------------------
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index e60fee3..a1852d6 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -70,6 +70,12 @@
             <version>${cxf.version}</version>
             <scope>test</scope>
         </dependency>
+         <dependency>
+      		<groupId>org.apache.cxf</groupId>
+      		<artifactId>cxf-rt-rs-extension-search</artifactId>
+      		<version>${cxf.version}</version>
+      		<scope>test</scope>
+   		</dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/691014f8/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
----------------------------------------------------------------------
diff --git a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
index 1ba2dde..975c97f 100644
--- a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
+++ b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
@@ -50,6 +50,7 @@ import org.apache.cxf.feature.Feature;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.apache.cxf.jaxrs.ext.ContextProvider;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Component;
@@ -175,7 +176,8 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
         return (intent instanceof ExceptionMapper) // 
             || (intent instanceof MessageBodyReader) //
             || (intent instanceof MessageBodyWriter) //
-            || (intent instanceof ContextResolver);
+            || (intent instanceof ContextResolver) //
+            || (intent instanceof ContextProvider); 
     }
 
     private Endpoint createServerFromFactory(JAXRSServerFactoryBean factory,


Mime
View raw message