cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [cxf] branch master updated: [CXF-7917]WebSocketDestinationFactory should check http-undertow or http-jetty on the classpath to determine which implementation should be used
Date Tue, 04 Dec 2018 03:46:51 GMT
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new a94bbb4  [CXF-7917]WebSocketDestinationFactory should check http-undertow or http-jetty
on the classpath to determine which implementation should be used
     new 4835e32  Merge branch 'master' of github.com:apache/cxf
a94bbb4 is described below

commit a94bbb4fea70c9b5fdd0c61d9e15a6fdbd9bc30c
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Tue Dec 4 11:46:13 2018 +0800

    [CXF-7917]WebSocketDestinationFactory should check http-undertow or http-jetty on the
classpath to determine which implementation should be used
---
 .../apache/cxf/transport/websocket/WebSocketDestinationFactory.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
index bd364ad..05a059a 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
@@ -39,8 +39,10 @@ import org.apache.cxf.transport.websocket.atmosphere.AtmosphereWebSocketServletD
 @NoJSR250Annotations()
 public class WebSocketDestinationFactory implements HttpDestinationFactory {
     private static final boolean ATMOSPHERE_AVAILABLE = probeClass("org.atmosphere.cpr.ApplicationConfig");
-    private static final boolean JETTY_AVAILABLE = probeClass("org.eclipse.jetty.server.Server");
-    private static final boolean UNDERTOW_AVAILABLE = probeClass("io.undertow.websockets.core.WebSockets");
+    private static final boolean JETTY_AVAILABLE = 
+        probeClass("org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory");
+    private static final boolean UNDERTOW_AVAILABLE = 
+        probeClass("org.apache.cxf.transport.http_undertow.UndertowHTTPServerEngineFactory");
     private static final Constructor<?> JETTY9_WEBSOCKET_DESTINATION_CTR =
         probeConstructor("org.apache.cxf.transport.websocket.jetty9.Jetty9WebSocketDestination");
     private static final Constructor<?> UNDERTOW_WEBSOCKET_DESTINATION_CTR =


Mime
View raw message