SSDM-1507: Fix webstart certificate problems and rtd_cina distribution contents

SVN: 33462

common/source/java/ch/systemsx/cisd/common/spring/HttpInvokerUtils.java

@@ -84,7 +84,7 @@ public class HttpInvokerUtils
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(schemeRegistry);
         connectionManager.setMaxTotal(100);
         connectionManager.setDefaultMaxPerRoute(5);
-        CloseableHttpClient client = HttpClientBuilder.create().setConnectionManager(connectionManager).build();
+        CloseableHttpClient client = HttpClientBuilder.create().setConnectionManager(connectionManager).useSystemProperties().build();
 
         HttpComponentsHttpInvokerRequestExecutor httpInvokerRequestExecutor = new HttpComponentsHttpInvokerRequestExecutor(client);
 
@@ -99,7 +99,8 @@ public class HttpInvokerUtils
         if (proxyAddressOrNull != null)
         {
             HttpHost proxy = new HttpHost(proxyAddressOrNull.getHostName(), proxyAddressOrNull.getPort(), "http");
-            CloseableHttpClient client2 = HttpClientBuilder.create().setProxy(proxy).setConnectionManager(connectionManager).build();
+            CloseableHttpClient client2 =
+                    HttpClientBuilder.create().setProxy(proxy).useSystemProperties().setConnectionManager(connectionManager).build();
             httpInvokerRequestExecutor.setHttpClient(client2);
         }
         httpInvokerProxy.afterPropertiesSet();
@@ -130,11 +131,13 @@ public class HttpInvokerUtils
         if (proxyAddressOrNull != null)
         {
             HttpHost proxy = new HttpHost(proxyAddressOrNull.getHostName(), proxyAddressOrNull.getPort(), "http");
-            CloseableHttpClient client2 = HttpClientBuilder.create().setProxy(proxy).setConnectionManager(connectionManager).build();
+            CloseableHttpClient client2 =
+                    HttpClientBuilder.create().setProxy(proxy).useSystemProperties().setConnectionManager(connectionManager).build();
             httpInvokerRequestExecutor.setHttpClient(client2);
         } else
         {
-            httpInvokerRequestExecutor.setHttpClient(HttpClientBuilder.create().setConnectionManager(connectionManager).build());
+            httpInvokerRequestExecutor
+                    .setHttpClient(HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build());
         }
         httpInvokerProxy.afterPropertiesSet();
         return getCastedService(httpInvokerProxy);

openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinder.java

@@ -56,8 +56,7 @@ public class ServiceFinder
     }
 
     /**
-     * Creates a remote service implementing specified interface for specified server URL. Following
-     * server URLs are accepted:
+     * Creates a remote service implementing specified interface for specified server URL. Following server URLs are accepted:
      * <ul>
      * <li>protocol://host:port
      * <li>protocol://host:port/applicationName
@@ -70,8 +69,7 @@ public class ServiceFinder
     }
 
     /**
-     * Creates a remote service implementing specified interface for specified server URL. Following
-     * server URLs are accepted:
+     * Creates a remote service implementing specified interface for specified server URL. Following server URLs are accepted:
      * <ul>
      * <li>protocol://host:port
      * <li>protocol://host:port/applicationName
@@ -92,8 +90,8 @@ public class ServiceFinder
     }
 
     /**
-     * Creates a remote service implementing specified interface for specified server URL by using
-     * specified pinger for checking server connection. Following server URLs are accepted:
+     * Creates a remote service implementing specified interface for specified server URL by using specified pinger for checking server connection.
+     * Following server URLs are accepted:
      * <ul>
      * <li>protocol://host:port
      * <li>protocol://host:port/applicationName
@@ -107,8 +105,8 @@ public class ServiceFinder
     }
 
     /**
-     * Creates a remote service implementing specified interface for specified server URL by using
-     * specified pinger for checking server connection. Following server URLs are accepted:
+     * Creates a remote service implementing specified interface for specified server URL by using specified pinger for checking server connection.
+     * Following server URLs are accepted:
      * <ul>
      * <li>protocol://host:port
      * <li>protocol://host:port/applicationName
@@ -167,11 +165,11 @@ public class ServiceFinder
     private <S> S createServiceStubStoringCertificateIfNecessary(Class<S> serviceInterface,
             long timeoutInMillis, String usedServerUrl)
     {
+        storeCertificateIfNecessary(usedServerUrl);
         S service;
         service =
                 createServiceStub(serviceInterface, usedServerUrl + urlServiceSuffix,
                         timeoutInMillis);
-        storeCertificateIfNecessary(usedServerUrl);
         return service;
     }
 

rtd_cina/build.gradle

@@ -44,20 +44,28 @@ cinaDssClientJar.dependsOn jar
 task cinaDssClient(type: Zip) {
 	baseName 'dss_client-cina'
 	from (project(':openbis_standard_technologies').copyJarsForWebStart.outputs.getFiles().getAsFileTree().matching {
-		include 'cisd-args4j.jar'
-		include 'cisd-base.jar'
-		include 'commons-codec.jar'
-		include 'commons-httpclient.jar'
-		include 'commons-io.jar'
-		include 'commons-lang.jar'
-		include 'commons-logging.jar'
-		include 'jline.jar'
-		include 'jython.jar'
-		include 'log4j.jar'
-		include 'spring.jar'
-		include 'stream-supporting-httpinvoker.jar'
-		}) {
-		into 'dss_client/lib'
+        include 'cisd-args4j.jar'
+        include 'cisd-base.jar'
+        include 'aopalliance.jar'
+        include 'commons-codec.jar'
+        include 'httpclient.jar'
+        include 'httpcore.jar'
+        include 'commons-io.jar'
+        include 'commons-lang.jar'
+        include 'commons-logging.jar'
+        include 'jline.jar'
+        include 'jython.jar'
+        include 'log4j.jar'
+        include 'spring-aop.jar'
+        include 'spring-beans.jar'
+        include 'spring-context.jar'
+        include 'spring-core.jar'
+        include 'spring-web.jar'
+        include 'spring-webmvc.jar'
+        include 'spring-expression.jar'
+        include 'stream-supporting-httpinvoker.jar'
+        }) {
+        into 'dss_client/lib'
 	}
 
     from (cinaDssClientJar.outputs.getFiles()) {