Repository: cxf Updated Branches: refs/heads/master 6d7ab22d5 -> 431ade6fe
[CXF-6253]Upgrade async-http-client to 1.9.0 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/431ade6f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/431ade6f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/431ade6f Branch: refs/heads/master Commit: 431ade6fe85f4d13f56aa4bc530cb50353be0dd5 Parents: 6d7ab22 Author: Freeman Fang <[email protected]> Authored: Wed Feb 11 15:15:07 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Wed Feb 11 15:15:07 2015 +0800 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../cxf/transport/websocket/ahc/AhcWebSocketConduit.java | 8 ++++---- .../cxf/systest/jaxrs/websocket/WebSocketTestClient.java | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/431ade6f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 356ea8f..4e86697 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,7 +69,7 @@ <!-- please maintain alphabetical order here --> <cxf.abdera.version>1.1.3</cxf.abdera.version> <cxf.activemq.version>5.10.0</cxf.activemq.version> - <cxf.ahc.version>1.8.5</cxf.ahc.version> + <cxf.ahc.version>1.9.0</cxf.ahc.version> <cxf.apacheds.version>2.0.0-M19</cxf.apacheds.version> <cxf.atmosphere.version>2.2.5</cxf.atmosphere.version> <cxf.atmosphere.version.range>[2.0,3.0)</cxf.atmosphere.version.range> http://git-wip-us.apache.org/repos/asf/cxf/blob/431ade6f/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java index 897b0d1..c247538 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java @@ -34,10 +34,10 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.ning.http.client.AsyncHttpClient; -import com.ning.http.client.websocket.WebSocket; -import com.ning.http.client.websocket.WebSocketByteListener; -import com.ning.http.client.websocket.WebSocketTextListener; -import com.ning.http.client.websocket.WebSocketUpgradeHandler; +import com.ning.http.client.ws.WebSocket; +import com.ning.http.client.ws.WebSocketByteListener; +import com.ning.http.client.ws.WebSocketTextListener; +import com.ning.http.client.ws.WebSocketUpgradeHandler; import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; http://git-wip-us.apache.org/repos/asf/cxf/blob/431ade6f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java index 6f3f8ad..54ec042 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java @@ -31,10 +31,10 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import com.ning.http.client.AsyncHttpClient; -import com.ning.http.client.websocket.WebSocket; -import com.ning.http.client.websocket.WebSocketByteListener; -import com.ning.http.client.websocket.WebSocketTextListener; -import com.ning.http.client.websocket.WebSocketUpgradeHandler; +import com.ning.http.client.ws.WebSocket; +import com.ning.http.client.ws.WebSocketByteListener; +import com.ning.http.client.ws.WebSocketTextListener; +import com.ning.http.client.ws.WebSocketUpgradeHandler; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.transport.websocket.WebSocketConstants; @@ -75,7 +75,7 @@ class WebSocketTestClient { } public void sendTextMessage(String message) { - websocket.sendTextMessage(message); + websocket.sendMessage(message); } public void sendMessage(byte[] message) {
