From dd7bfd273c763f884d7decae8f0f49c53620e2a2 Mon Sep 17 00:00:00 2001 From: remillet Date: Mon, 11 Jul 2016 09:12:54 -0700 Subject: [PATCH] CSPACE-6984: Adding support for SSL connections to Shared Authority server. --- .../client/AbstractServiceClientImpl.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java index 010cf33eb..c5580ee9f 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java @@ -42,6 +42,8 @@ import org.apache.commons.httpclient.auth.AuthScope; import org.collectionspace.services.common.api.Tools; import org.collectionspace.services.jaxb.AbstractCommonList; import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.resteasy.client.jaxrs.engines.URLConnectionEngine; import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; import org.jboss.resteasy.plugins.providers.RegisterBuiltin; import org.jboss.resteasy.spi.ResteasyProviderFactory; @@ -537,13 +539,15 @@ public abstract class AbstractServiceClientImpl proxyClass = this.getProxyClass(); - if (useSSL()) { - SSLContext sslcontext = SSLContexts.custom().useSSL().build(); - sslcontext.init(null, new X509TrustManager[]{new HttpsTrustManager()}, new SecureRandom()); - client = (ResteasyClient)ClientBuilder.newBuilder().sslContext(sslcontext).build(); - } else { - client = (ResteasyClient)ClientBuilder.newClient(); - } +// if (useSSL()) { +// SSLContext sslcontext = SSLContexts.custom().useSSL().build(); +// sslcontext.init(null, new X509TrustManager[]{new HttpsTrustManager()}, new SecureRandom()); +// client = (ResteasyClient)ClientBuilder.newBuilder().sslContext(sslcontext).build(); +// } else { +// client = (ResteasyClient)ClientBuilder.newClient(); +// } + + client = new ResteasyClientBuilder().httpEngine(new URLConnectionEngine()).build(); if (useAuth()) { String user = properties.getProperty(USER_PROPERTY); -- 2.47.3