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/6b459864 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b459864 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b459864 Branch: refs/heads/master Commit: 6b45986445124298f708141ec30cddc579cf37c6 Parents: b15aa32 0024d94 Author: Sergey Beryozkin <[email protected]> Authored: Tue May 20 22:34:48 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue May 20 22:34:48 2014 +0100 ---------------------------------------------------------------------- .../main/release/samples/jax_rs/websocket/pom.xml | 8 ++++---- distribution/src/main/release/samples/pom.xml | 1 + .../karaf/features/src/main/resources/features.xml | 4 ++++ .../websocket/WebSocketServletHolder.java | 1 + .../websocket/WebSocketVirtualServletRequest.java | 4 ++++ .../atmosphere/AtmosphereWebSocketHandler.java | 5 +++++ .../transport/websocket/jetty/JettyWebSocket.java | 17 +++++++++++++++-- .../SpnegoContextTokenInInterceptor.java | 6 ++++++ 8 files changed, 40 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
