From commits-return-75866-apmail-camel-commits-archive=camel.apache.org@camel.apache.org Fri Aug 2 12:27:16 2019 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 [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id E3E8819823 for ; Fri, 2 Aug 2019 12:27:15 +0000 (UTC) Received: (qmail 86972 invoked by uid 500); 2 Aug 2019 12:27:15 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 86811 invoked by uid 500); 2 Aug 2019 12:27:15 -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 86795 invoked by uid 99); 2 Aug 2019 12:27:15 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2019 12:27:15 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 32858816C6; Fri, 2 Aug 2019 12:27:15 +0000 (UTC) Date: Fri, 02 Aug 2019 12:27:15 +0000 To: "commits@camel.apache.org" Subject: [camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Websocket MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: acosentino@apache.org In-Reply-To: <156474883438.29942.6952853297422527845@gitbox.apache.org> References: <156474883438.29942.6952853297422527845@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 469f38800f416223d5e395340565511217951c7b X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190802122715.32858816C6@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 469f38800f416223d5e395340565511217951c7b Author: Andrea Cosentino AuthorDate: Fri Aug 2 14:24:39 2019 +0200 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Websocket --- .../websocket/WebsocketSSLContextInUriRouteExampleTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java index 1e1e6ed..6e73ed5 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java @@ -29,6 +29,8 @@ import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.JdkSslContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.spi.Registry; +import org.apache.camel.support.SimpleRegistry; import org.apache.camel.support.jsse.KeyManagersParameters; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; @@ -66,7 +68,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport { } @Override - protected JndiRegistry createRegistry() throws Exception { + protected Registry createCamelRegistry() throws Exception { KeyStoreParameters ksp = new KeyStoreParameters(); ksp.setResource("jsse/localhost.ks"); ksp.setPassword(pwd); @@ -87,7 +89,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport { sslContextParameters.setTrustManagers(tmp); sslContextParameters.setServerParameters(scsp); - JndiRegistry registry = super.createRegistry(); + Registry registry = new SimpleRegistry(); registry.bind("sslContextParameters", sslContextParameters); return registry; }