You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/02 12:27:14 UTC
[camel] branch master updated (ed41d44 -> 5e50958)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ed41d44 CAMEL-13792 - Rename components to default names, Camel-mongodb3 to camel-mongodb - Docs and regen
new 469f388 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Websocket
new 5e50958 Removed unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../websocket/WebsocketSSLContextInUriRouteExampleTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
[camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Websocket
Posted by ac...@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 <an...@gmail.com>
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;
}
[camel] 02/02: Removed unused imports
Posted by ac...@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 5e50958eee06e81cc2246cea6821780fb7a69e00
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 14:25:53 2019 +0200
Removed unused imports
---
.../component/websocket/WebsocketSSLContextInUriRouteExampleTest.java | 1 -
1 file changed, 1 deletion(-)
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 6e73ed5..9f36fcf 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
@@ -28,7 +28,6 @@ import javax.net.ssl.SSLContext;
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;