camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/3] git commit: Removed the unused code of WebsocketSSLContextInUriRouteExampleTest
Date Thu, 06 Nov 2014 09:48:36 GMT
Removed the unused code of WebsocketSSLContextInUriRouteExampleTest


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

Branch: refs/heads/master
Commit: 4c48e8715d1c764321ca05636363a8689a1bdfe1
Parents: b538169
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Thu Nov 6 15:37:49 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Thu Nov 6 17:48:15 2014 +0800

----------------------------------------------------------------------
 ...ebsocketSSLContextInUriRouteExampleTest.java | 25 ++------------------
 1 file changed, 2 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4c48e871/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 dec0b17..0987317 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
@@ -71,10 +71,10 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport
{
     protected JndiRegistry createRegistry() throws Exception {
         KeyStoreParameters ksp = new KeyStoreParameters();
         ksp.setResource("jsse/localhost.ks");
-        ksp.setPassword("changeit");
+        ksp.setPassword(pwd);
 
         KeyManagersParameters kmp = new KeyManagersParameters();
-        kmp.setKeyPassword("changeit");
+        kmp.setKeyPassword(pwd);
         kmp.setKeyStore(ksp);
 
         TrustManagersParameters tmp = new TrustManagersParameters();
@@ -115,27 +115,6 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport
{
         return c;
     }
 
-    protected SSLContextParameters defineSSLContextParameters() {
-
-        KeyStoreParameters ksp = new KeyStoreParameters();
-        // ksp.setResource(this.getClass().getClassLoader().getResource("jsse/localhost.ks").toString());
-        ksp.setResource("jsse/localhost.ks");
-        ksp.setPassword(pwd);
-
-        KeyManagersParameters kmp = new KeyManagersParameters();
-        kmp.setKeyPassword(pwd);
-        kmp.setKeyStore(ksp);
-
-        TrustManagersParameters tmp = new TrustManagersParameters();
-        tmp.setKeyStore(ksp);
-
-        SSLContextParameters sslContextParameters = new SSLContextParameters();
-        sslContextParameters.setKeyManagers(kmp);
-        sslContextParameters.setTrustManagers(tmp);
-
-        return sslContextParameters;
-    }
-
     @Test
     public void testWSHttpCall() throws Exception {
 


Mime
View raw message