You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2010/03/20 00:09:03 UTC
svn commit: r925473 -
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
Author: rajith
Date: Fri Mar 19 23:09:02 2010
New Revision: 925473
URL: http://svn.apache.org/viewvc?rev=925473&view=rev
Log:
Modified SSLTest to temporarily set all ssl jvm args to invalid values, to test all connection level ssl params.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java?rev=925473&r1=925472&r2=925473&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java Fri Mar 19 23:09:02 2010
@@ -16,19 +16,24 @@ public class SSLTest extends QpidTestCas
{
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true'&ssl_verify_hostname='true'" +
- "&key_store='%s'&keystore_password='%s'" +
+ "&key_store='%s'&key_store_password='%s'" +
"&trust_store='%s'&trust_store_password='%s'" +
"'";
+
+ String keyStore = System.getProperty("javax.net.ssl.keyStore");
+ String keyStorePass = System.getProperty("javax.net.ssl.keyStorePassword");
+ String trustStore = System.getProperty("javax.net.ssl.trustStore");
+ String trustStorePass = System.getProperty("javax.net.ssl.trustStorePassword");
+
url = String.format(url,System.getProperty("test.port.ssl"),
- System.getProperty("javax.net.ssl.keyStore"),
- System.getProperty("javax.net.ssl.keyStorePassword"),
- System.getProperty("javax.net.ssl.trustStore"),
- System.getProperty("javax.net.ssl.trustStorePassword"));
+ keyStore,keyStorePass,trustStore,trustStorePass);
- // temporarily set the trust store jvm arg to something else
+ // temporarily set the trust/key store jvm args to something else
// to ensure we only read from the connection URL param.
- String tmp = System.getProperty("javax.net.ssl.trustStore");
System.setProperty("javax.net.ssl.trustStore","fessgsdgd");
+ System.setProperty("javax.net.ssl.trustStorePassword","fessgsdgd");
+ System.setProperty("javax.net.ssl.keyStore","fessgsdgd");
+ System.setProperty("javax.net.ssl.keyStorePassword","fessgsdgd");
try
{
AMQConnection con = new AMQConnection(url);
@@ -40,7 +45,10 @@ public class SSLTest extends QpidTestCas
}
finally
{
- System.setProperty("javax.net.ssl.trustStore",tmp);
+ System.setProperty("javax.net.ssl.trustStore",trustStore);
+ System.setProperty("javax.net.ssl.trustStorePassword",trustStorePass);
+ System.setProperty("javax.net.ssl.keyStore",keyStore);
+ System.setProperty("javax.net.ssl.keyStorePassword",keyStorePass);
}
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org