From commits-return-50585-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Tue Dec 4 04:46:54 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B8D47180645 for ; Tue, 4 Dec 2018 04:46:53 +0100 (CET) Received: (qmail 62743 invoked by uid 500); 4 Dec 2018 03:46:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 62734 invoked by uid 99); 4 Dec 2018 03:46:51 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2018 03:46:51 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 495C180612; Tue, 4 Dec 2018 03:46:51 +0000 (UTC) Date: Tue, 04 Dec 2018 03:46:51 +0000 To: "commits@cxf.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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154389521120.26530.15171679079534653981@gitbox.apache.org> From: ffang@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ce8a7729a6db509d2bcb57d73a0a634c675b1230 X-Git-Newrev: a94bbb4fea70c9b5fdd0c61d9e15a6fdbd9bc30c X-Git-Rev: a94bbb4fea70c9b5fdd0c61d9e15a6fdbd9bc30c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 =