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 Wed, 27 Aug 2014 14:16:16 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/41348da1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41348da1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41348da1

Branch: refs/heads/master
Commit: 41348da1b88da56ae55c8c4181e6bb2507a52a3e
Parents: 162bbb5 481466c
Author: reta <drreta@gmail.com>
Authored: Wed Aug 27 10:15:58 2014 -0400
Committer: reta <drreta@gmail.com>
Committed: Wed Aug 27 10:15:58 2014 -0400

----------------------------------------------------------------------
 .../cxf/jaxrs/model/wadl/WadlGenerator.java     |  28 +++-
 .../WebSocketVirtualServletRequest.java         | 132 +++++++++----------
 .../WebSocketVirtualServletResponse.java        | 114 ++++++++--------
 .../websocket/ahc/AhcWebSocketConduit.java      |   8 +-
 .../atmosphere/AtmosphereWebSocketHandler.java  |   8 +-
 .../AtmosphereWebSocketStreamHandler.java       |   2 +-
 .../websocket/jetty/JettyWebSocket.java         |  10 +-
 7 files changed, 160 insertions(+), 142 deletions(-)
----------------------------------------------------------------------



Mime
View raw message