cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject cxf git commit: [CXF-7060] Fix cxf-async which does not provide an http server factory, and add the websocket one instead Make blueprint actually optional for http-jetty and http-undertow
Date Thu, 22 Sep 2016 13:10:14 GMT
Repository: cxf
Updated Branches:
  refs/heads/master a5df4ba24 -> 38919f57b


[CXF-7060] Fix cxf-async which does not provide an http server factory, and add the websocket
one instead
Make blueprint actually optional for http-jetty and http-undertow

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

Branch: refs/heads/master
Commit: 38919f57bfb2b880691950fc5f992b5649ea579e
Parents: a5df4ba
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Thu Sep 22 15:00:32 2016 +0200
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Thu Sep 22 15:09:51 2016 +0200

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    | 12 +++++------
 rt/transports/http-jetty/pom.xml                |  1 +
 .../osgi/HTTPJettyTransportActivator.java       | 22 ++++++++++++--------
 rt/transports/http-undertow/pom.xml             |  1 +
 .../osgi/HTTPUndertowTransportActivator.java    | 22 ++++++++++++--------
 5 files changed, 33 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/38919f57/osgi/karaf4/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf4/features/src/main/resources/features.xml b/osgi/karaf4/features/src/main/resources/features.xml
index 8db5d65..0f9504e 100644
--- a/osgi/karaf4/features/src/main/resources/features.xml
+++ b/osgi/karaf4/features/src/main/resources/features.xml
@@ -169,7 +169,6 @@
     <feature name="cxf-http-jetty" version="${project.version}">
         <feature version="${project.version}">cxf-http</feature>
         <feature version="[7,10)">jetty</feature>
-        <feature>aries-blueprint</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
         <capability>
             cxf.http.provider;name=jetty
@@ -181,9 +180,6 @@
         <bundle start-level="40">mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.version}</bundle>
         <bundle start-level="40">mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-hc/${project.version}</bundle>
-        <capability>
-            cxf.http.provider;name=async
-        </capability>
     </feature>
     <feature name="cxf-http-netty-client" version="${project.version}">
         <feature version="${project.version}">cxf-http</feature>
@@ -212,7 +208,6 @@
     <feature name="cxf-http-undertow" version="${project.version}">
         <feature version="${project.version}">cxf-http</feature>
         <feature>pax-http-undertow</feature>
-		<feature>aries-blueprint</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${project.version}</bundle>
         <capability>
             cxf.http.provider;name=undertow
@@ -270,7 +265,7 @@
         <feature version="${project.version}">cxf-rs-security-jose</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle>
     </feature>
-    <feature name="cxf-jackson" version="${project.version}" resolver="(obr)">
+    <feature name="cxf-jackson" version="${project.version}">
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle>
@@ -278,7 +273,7 @@
         <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle>
     </feature>
-    <feature name="cxf-rs-description-swagger2" version="${project.version}" resolver="(obr)">
+    <feature name="cxf-rs-description-swagger2" version="${project.version}">
         <feature version="${project.version}">cxf-jaxrs</feature>
         <feature version="${project.version}">cxf-jackson</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}</bundle>
@@ -374,6 +369,9 @@
         <feature version="${project.version}">cxf-http</feature>
         <bundle dependency='true'>mvn:org.atmosphere/atmosphere-runtime/${cxf.atmosphere.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${project.version}</bundle>
+        <capability>
+            cxf.http.provider;name=websocket
+        </capability>
     </feature>
     <feature name="cxf-javascript" version="${project.version}">
         <feature version="${project.version}">cxf-core</feature>

http://git-wip-us.apache.org/repos/asf/cxf/blob/38919f57/rt/transports/http-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index 40f65cd..05a2010 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -35,6 +35,7 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
+            org.osgi.service.blueprint*;resolution:=optional,
             org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
             org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>

http://git-wip-us.apache.org/repos/asf/cxf/blob/38919f57/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
index b37ed4d..5f13c06 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
@@ -78,15 +78,19 @@ public class HTTPJettyTransportActivator
                                        this, servProps);
         
         mbeanServerTracker = new ServiceTracker(ctx, MBeanServer.class.getName(), null);
-        BlueprintNameSpaceHandlerFactory nsHandlerFactory = new BlueprintNameSpaceHandlerFactory()
{
-            
-            @Override
-            public Object createNamespaceHandler() {
-                return new HTTPJettyTransportNamespaceHandler();
-            }
-        };
-        NamespaceHandlerRegisterer.register(context, nsHandlerFactory,
-                                            "http://cxf.apache.org/transports/http-jetty/configuration");
 
+        try {
+            BlueprintNameSpaceHandlerFactory nsHandlerFactory = new BlueprintNameSpaceHandlerFactory()
{
+
+                @Override
+                public Object createNamespaceHandler() {
+                    return new HTTPJettyTransportNamespaceHandler();
+                }
+            };
+            NamespaceHandlerRegisterer.register(context, nsHandlerFactory,
+                    "http://cxf.apache.org/transports/http-jetty/configuration");
+        } catch (NoClassDefFoundError e) {
+            // Blueprint not available, ignore
+        }
     }
 
     public void stop(BundleContext ctx) throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/38919f57/rt/transports/http-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml
index 64cc205..14b39a0 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -35,6 +35,7 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             io.undertow*;version="${cxf.undertow.osgi.version}",
+            org.osgi.service.blueprint*;resolution:=optional,
             org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
             org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>

http://git-wip-us.apache.org/repos/asf/cxf/blob/38919f57/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
index 5f87db0..67a31e8 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
@@ -78,15 +78,19 @@ public class HTTPUndertowTransportActivator
                                        this, servProps);
         
         mbeanServerTracker = new ServiceTracker(ctx, MBeanServer.class.getName(), null);
-        BlueprintNameSpaceHandlerFactory nsHandlerFactory = new BlueprintNameSpaceHandlerFactory()
{
-            
-            @Override
-            public Object createNamespaceHandler() {
-                return new HTTPUndertowTransportNamespaceHandler();
-            }
-        };
-        NamespaceHandlerRegisterer.register(context, nsHandlerFactory,
-                                            "http://cxf.apache.org/transports/http-undertow/configuration");
 
+        try {
+            BlueprintNameSpaceHandlerFactory nsHandlerFactory = new BlueprintNameSpaceHandlerFactory()
{
+
+                @Override
+                public Object createNamespaceHandler() {
+                    return new HTTPUndertowTransportNamespaceHandler();
+                }
+            };
+            NamespaceHandlerRegisterer.register(context, nsHandlerFactory,
+                    "http://cxf.apache.org/transports/http-undertow/configuration");
+        } catch (NoClassDefFoundError e) {
+            // Blueprint not available, ignore
+        }
     }
 
     public void stop(BundleContext ctx) throws Exception {


Mime
View raw message