Detect if the netty libraries are there and not load teh dest factory if they 
aren't.   Mark it optional.


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

Branch: refs/heads/3.0.x-fixes
Commit: 8453007e9dbb6b579e0dbc1cea857d8d64b5f6d4
Parents: 224fa3c
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Nov 13 11:21:05 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 14 11:27:25 2014 -0500

----------------------------------------------------------------------
 .../http/netty/server/NettyHttpDestinationFactory.java          | 5 +++++
 .../src/main/resources/META-INF/cxf/bus-extensions.txt          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8453007e/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
----------------------------------------------------------------------
diff --git 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
index a086ecd..a502847 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
+++ 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationFactory.java
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.transport.http.netty.server;
 
+
 import java.io.IOException;
 
 import org.apache.cxf.Bus;
@@ -30,6 +31,10 @@ import org.apache.cxf.transport.http.HttpDestinationFactory;
 
 @NoJSR250Annotations()
 public class NettyHttpDestinationFactory implements HttpDestinationFactory {
+    
+    public NettyHttpDestinationFactory() {
+        io.netty.util.Version.identify();
+    }
 
     public AbstractHTTPDestination createDestination(EndpointInfo 
endpointInfo, Bus bus,
                                                      DestinationRegistry 
registry) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8453007e/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
----------------------------------------------------------------------
diff --git 
a/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
 
b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
index 17b637f..d7f4cbb 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
+++ 
b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/cxf/bus-extensions.txt
@@ -1,3 +1,3 @@
 org.apache.cxf.transport.http.netty.server.NettyHttpTransportFactory::true
-org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory::true
+org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory::true:true
 org.apache.cxf.transport.http.netty.server.NettyHttpServerEngineFactory::true

Reply via email to