cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Fri, 29 Aug 2014 14:14:24 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/master
Commit: 6bec79650c58f68ecb81fced39efa4ee2d966a18
Parents: eee2a94 fa8a614
Author: reta <drreta@gmail.com>
Authored: Fri Aug 29 10:12:06 2014 -0400
Committer: reta <drreta@gmail.com>
Committed: Fri Aug 29 10:12:06 2014 -0400

----------------------------------------------------------------------
 .../release/samples/jax_rs/websocket/README.txt |  14 +-
 .../release/samples/jax_rs/websocket/pom.xml    |   5 +
 .../demo/jaxrs/client/WebSocketTestClient.java  |  34 +++--
 .../java/demo/jaxrs/server/CustomerService.java |  19 ++-
 .../cxf/transport/websocket/WebSocketUtils.java |  93 +++++++++---
 .../WebSocketVirtualServletResponse.java        |   5 +-
 .../websocket/ahc/AhcWebSocketConduit.java      |  35 +++--
 .../transport/websocket/WebSocketUtilsTest.java |  82 +++++++++++
 .../jaxrs/websocket/BookStoreWebSocket.java     |  44 +++++-
 .../JAXRSClientServerWebSocketTest.java         | 144 +++++++++++++++++++
 .../jaxrs/websocket/WebSocketTestClient.java    |  37 +++--
 11 files changed, 444 insertions(+), 68 deletions(-)
----------------------------------------------------------------------



Mime
View raw message