ref #8931 using https for port 443

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 16d7d70fd30c45f7dc953972e4cca7b80ef9f321..f90ff1107efc98650cb51e01de0deba3c35c6a98 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -177,10 +177,11 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
             HttpComponentsHttpInvokerRequestExecutor executor) {\r
 \r
         String baseUrl;\r
+        String protocol = remoteSource.getPort() == 443 ? "https" : "http";\r
         if(remoteSource.getContextPath() == null || remoteSource.getContextPath().equals("")) {\r
-            baseUrl = "http://" + remoteSource.getServer() + ":" + String.valueOf(remoteSource.getPort());\r
+            baseUrl = protocol + "://" + remoteSource.getServer() + ":" + String.valueOf(remoteSource.getPort());\r
         } else {\r
-            baseUrl = "http://" + remoteSource.getServer()  + ":" + String.valueOf(remoteSource.getPort()) + "/" + remoteSource.getContextPath();\r
+            baseUrl = protocol + "://" + remoteSource.getServer()  + ":" + String.valueOf(remoteSource.getPort()) + "/" + remoteSource.getContextPath();\r
         }\r
         CachingHttpInvokerProxyFactoryBean proxyFactory = new CachingHttpInvokerProxyFactoryBean();\r
         proxyFactory.setServiceInterface(clazz);\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
index 911b1743800af9397a84b1e661ab333f649634ce..961d76591b22d8365b2469ad79af1587fa128c02 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
@@ -144,7 +144,8 @@ public class CdmServerInfo {
     }
 
     public void updateInfo() throws CDMServerException {
-        String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "info.jsp";
+
+        String url = guessProtocol() + "://" + server + ":" + String.valueOf(port) + "/" + prefix + "info.jsp";
         String responseBody = getResponse(url);
         if(responseBody != null) {
             try {
@@ -157,9 +158,17 @@ public class CdmServerInfo {
         }
     }
 
+
+    /**
+     * @return
+     */
+    String guessProtocol() {
+        return port == 443 ? "https" : "http";
+    }
+
     public void addInstancesViaHttp() throws CDMServerException {
         updateInfo();
-        String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "instances.jsp";
+        String url = guessProtocol() + "://" + server + ":" + String.valueOf(port) + "/" + prefix + "instances.jsp";
         String responseBody = getResponse(url);
         if(responseBody != null) {
             try {