camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: Fix Camel-8619 Camel WebSocket SSL tests fail
Date Sun, 12 Apr 2015 08:14:48 GMT
Fix Camel-8619 Camel WebSocket SSL tests fail


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea8130e7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea8130e7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea8130e7

Branch: refs/heads/camel-2.15.x
Commit: ea8130e7909bf1cdfb53d8c97dec3f8185cad7f0
Parents: 678b8ed
Author: ancosen <ancosen@gmail.com>
Authored: Sun Apr 12 09:51:25 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Apr 12 10:17:37 2015 +0200

----------------------------------------------------------------------
 .../websocket/WebsocketSSLContextInUriRouteExampleTest.java       | 3 +--
 .../camel/component/websocket/WebsocketSSLRouteExampleTest.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ea8130e7/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
----------------------------------------------------------------------
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 cd5a115..2d48c8f 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
@@ -83,7 +83,6 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport
{
         // NOTE: Needed since the client uses a loose trust configuration when no ssl context
         // is provided.  We turn on WANT client-auth to prefer using authentication
         SSLContextServerParameters scsp = new SSLContextServerParameters();
-        scsp.setClientAuthentication(ClientAuthentication.WANT.name());
 
         SSLContextParameters sslContextParameters = new SSLContextParameters();
         sslContextParameters.setKeyManagers(kmp);
@@ -109,7 +108,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport
{
                 new AsyncHttpClientConfig.Builder();
 
         builder.setSSLContext(new SSLContextParameters().createSSLContext());
-        builder.setHostnameVerifier(new AllowAllHostnameVerifier());
+        builder.setAcceptAnyCertificate(true);
         config = builder.build();
         c = new AsyncHttpClient(config);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ea8130e7/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
index 12364b0..d1af2c8 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
@@ -76,7 +76,7 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
                 new AsyncHttpClientConfig.Builder();
 
         builder.setSSLContext(new SSLContextParameters().createSSLContext());
-        builder.setHostnameVerifier(new AllowAllHostnameVerifier());
+        builder.setAcceptAnyCertificate(true);
         config = builder.build();
         c = new AsyncHttpClient(config);
 
@@ -100,7 +100,6 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
         // NOTE: Needed since the client uses a loose trust configuration when no ssl context
         // is provided.  We turn on WANT client-auth to prefer using authentication
         SSLContextServerParameters scsp = new SSLContextServerParameters();
-        scsp.setClientAuthentication(ClientAuthentication.WANT.name());
 
         SSLContextParameters sslContextParameters = new SSLContextParameters();
         sslContextParameters.setKeyManagers(kmp);


Mime
View raw message