Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 D982218C80 for ; Wed, 9 Dec 2015 20:42:25 +0000 (UTC) Received: (qmail 69916 invoked by uid 500); 9 Dec 2015 20:42:25 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 69869 invoked by uid 500); 9 Dec 2015 20:42:25 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 69860 invoked by uid 99); 9 Dec 2015 20:42:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 20:42:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95E25E00AA; Wed, 9 Dec 2015 20:42:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@camel.apache.org Message-Id: <4510b1b006954be7a26ffb73816a2aaf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: use the updated property name to disable jsr356 detection Date: Wed, 9 Dec 2015 20:42:25 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master c0b00733b -> 4adf56cda use the updated property name to disable jsr356 detection Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4adf56cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4adf56cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4adf56cd Branch: refs/heads/master Commit: 4adf56cda8822fd2db0bd5908e9b4fe81cfc541f Parents: c0b0073 Author: Akitoshi Yoshida Authored: Wed Dec 9 21:42:02 2015 +0100 Committer: Akitoshi Yoshida Committed: Wed Dec 9 21:42:02 2015 +0100 ---------------------------------------------------------------------- .../camel/component/atmosphere/websocket/WebsocketConsumer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4adf56cd/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java index 743851c..3c6ad9f 100644 --- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java +++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java @@ -51,7 +51,8 @@ public class WebsocketConsumer extends ServletConsumer { framework.addInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL, endpoint.isUseStreaming() ? WebsocketStreamHandler.class.getName() : WebsocketHandler.class.getName()); //REVISIT we need to disable JSR356 detection for now when using jetty-9.3 when using atmosphere-2.4.x - framework.addInitParameter("org.atmosphere.suppressDetectingJSR356", "true"); + //TODO switch to use contant ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356 aftr atmosphere-2.4.2 + framework.addInitParameter("org.atmosphere.websocket.suppressJSR356", "true"); framework.init(); WebSocketProtocol wsp = framework.getWebSocketProtocol();