Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 202AE200B74 for ; Thu, 1 Sep 2016 16:11:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1EA30160AB5; Thu, 1 Sep 2016 14:11:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 63CFA160AAE for ; Thu, 1 Sep 2016 16:11:19 +0200 (CEST) Received: (qmail 82705 invoked by uid 500); 1 Sep 2016 14:11:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 82692 invoked by uid 99); 1 Sep 2016 14:11:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2016 14:11:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08CC7E0243; Thu, 1 Sep 2016 14:11:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cshannon@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: NO-JIRA: Fixing OpenWireConnectionTimeoutTest failure Date: Thu, 1 Sep 2016 14:11:18 +0000 (UTC) archived-at: Thu, 01 Sep 2016 14:11:20 -0000 Repository: activemq Updated Branches: refs/heads/master 4a1f2f7ca -> e57de5441 NO-JIRA: Fixing OpenWireConnectionTimeoutTest failure Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e57de544 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e57de544 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e57de544 Branch: refs/heads/master Commit: e57de544100b031ef6a79be29738e9f97126b2dd Parents: 4a1f2f7 Author: Christopher L. Shannon (cshannon) Authored: Thu Sep 1 10:10:52 2016 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Thu Sep 1 10:10:52 2016 -0400 ---------------------------------------------------------------------- .../openwire/OpenWireConnectionTimeoutTest.java | 41 +++++++------------- 1 file changed, 14 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/e57de544/activemq-unit-tests/src/test/java/org/apache/activemq/openwire/OpenWireConnectionTimeoutTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/openwire/OpenWireConnectionTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/openwire/OpenWireConnectionTimeoutTest.java index 28e0989..50d1243 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/openwire/OpenWireConnectionTimeoutTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/openwire/OpenWireConnectionTimeoutTest.java @@ -21,19 +21,12 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.net.Socket; -import java.security.SecureRandom; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Collection; import java.util.Vector; import java.util.concurrent.TimeUnit; -import javax.net.ssl.KeyManager; -import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; @@ -61,12 +54,26 @@ public class OpenWireConnectionTimeoutTest { @Rule public TestName name = new TestName(); + public static final String KEYSTORE_TYPE = "jks"; + public static final String PASSWORD = "password"; + public static final String SERVER_KEYSTORE = "src/test/resources/server.keystore"; + public static final String TRUST_KEYSTORE = "src/test/resources/client.keystore"; + private Socket connection; protected String connectorScheme; protected int port; protected BrokerService brokerService; protected Vector exceptions = new Vector(); + static { + System.setProperty("javax.net.ssl.trustStore", TRUST_KEYSTORE); + System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD); + System.setProperty("javax.net.ssl.trustStoreType", KEYSTORE_TYPE); + System.setProperty("javax.net.ssl.keyStore", SERVER_KEYSTORE); + System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE); + System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD); + } + @Parameters(name="{0}") public static Collection data() { return Arrays.asList(new Object[][] { @@ -182,10 +189,6 @@ public class OpenWireConnectionTimeoutTest { brokerService.setUseJmx(false); brokerService.getManagementContext().setCreateConnector(false); - SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(new KeyManager[0], new TrustManager[]{new DefaultTrustManager()}, new SecureRandom()); - SSLContext.setDefault(ctx); - // Setup SSL context... final File classesDir = new File(OpenWireConnectionTimeoutTest.class.getProtectionDomain().getCodeSource().getLocation().getFile()); File keystore = new File(classesDir, "../../src/test/resources/server.keystore"); @@ -236,20 +239,4 @@ public class OpenWireConnectionTimeoutTest { brokerService = null; } } - - public class DefaultTrustManager implements X509TrustManager { - - @Override - public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { - } - - @Override - public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - } }