Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63366116B8 for ; Tue, 20 May 2014 21:35:06 +0000 (UTC) Received: (qmail 21244 invoked by uid 500); 20 May 2014 21:35:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 21185 invoked by uid 500); 20 May 2014 21:35:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 21178 invoked by uid 99); 20 May 2014 21:35:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2014 21:35:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 064C5984123; Tue, 20 May 2014 21:35:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Tue, 20 May 2014 21:35:06 -0000 Message-Id: <1aaea23699144a4aad07ee21da21e77f@git.apache.org> In-Reply-To: <631ece8c2686432da668f5b4d3854c14@git.apache.org> References: <631ece8c2686432da668f5b4d3854c14@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf 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 Authored: Tue May 20 22:34:48 2014 +0100 Committer: Sergey Beryozkin 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(-) ----------------------------------------------------------------------