You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2015/02/13 06:49:59 UTC
[1/2] cxf git commit: Revert "[CXF-6253]Upgrade async-http-client to
latest 1.9.8 instead of the 1.9.0"
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes d06d94cd8 -> 7ea458707
Revert "[CXF-6253]Upgrade async-http-client to latest 1.9.8 instead of the 1.9.0"
This reverts commit d06d94cd8c379400dab4a51980fd35c55a8223de.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/974a336c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/974a336c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/974a336c
Branch: refs/heads/3.0.x-fixes
Commit: 974a336c2bd02c8ab6e37f2c362fb4efb9769b00
Parents: d06d94c
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Feb 13 13:49:08 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Feb 13 13:49:08 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/974a336c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 858aa93..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.9.8</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>
[2/2] cxf git commit: Revert "[CXF-6253]Upgrade async-http-client to
1.9.0"
Posted by ff...@apache.org.
Revert "[CXF-6253]Upgrade async-http-client to 1.9.0"
This reverts commit 0324a7c0693e53c0594c3bdcfd2bc73f108d555a.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7ea45870
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7ea45870
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7ea45870
Branch: refs/heads/3.0.x-fixes
Commit: 7ea45870754c3ae87be8ea9bf80c22f764536619
Parents: 974a336
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Feb 13 13:49:21 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Feb 13 13:49:21 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/7ea45870/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fe558ad..826a10b 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.9.0</cxf.ahc.version>
+ <cxf.ahc.version>1.8.5</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/7ea45870/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 c247538..897b0d1 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.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketByteListener;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
+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 org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
http://git-wip-us.apache.org/repos/asf/cxf/blob/7ea45870/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 eb2fb1a..09e61c2 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.ws.WebSocket;
-import com.ning.http.client.ws.WebSocketByteListener;
-import com.ning.http.client.ws.WebSocketTextListener;
-import com.ning.http.client.ws.WebSocketUpgradeHandler;
+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 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.sendMessage(message);
+ websocket.sendTextMessage(message);
}
public void sendMessage(byte[] message) {