cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [1/2] cxf git commit: [CXF-6253]Upgrade async-http-client to 1.9.0 (cherry picked from commit 431ade6fe85f4d13f56aa4bc530cb50353be0dd5)
Date Fri, 13 Feb 2015 03:22:38 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 34740261e -> d06d94cd8


[CXF-6253]Upgrade async-http-client to 1.9.0
(cherry picked from commit 431ade6fe85f4d13f56aa4bc530cb50353be0dd5)

Conflicts:
	parent/pom.xml


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

Branch: refs/heads/3.0.x-fixes
Commit: 0324a7c0693e53c0594c3bdcfd2bc73f108d555a
Parents: 3474026
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Wed Feb 11 15:15:07 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Fri Feb 13 10:57:25 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/0324a7c0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 826a10b..fe558ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,7 +74,7 @@
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.version>1.1.3</cxf.abdera.version>
         <cxf.activemq.version>5.9.1</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.4</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/0324a7c0/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/0324a7c0/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 09e61c2..eb2fb1a 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;
@@ -72,7 +72,7 @@ class WebSocketTestClient {
     }
 
     public void sendTextMessage(String message) {
-        websocket.sendTextMessage(message);
+        websocket.sendMessage(message);
     }
 
     public void sendMessage(byte[] message) {


Mime
View raw message