Changeset 31880 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2017-08-14T22:23:04+12:00 (7 years ago)

Author:

ak19

Message:

All the changes that were required to set up multiple proxy servers, one for HTTP, one for HTTPS, one for FTP. Still need to test on Windows

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1453 +1453 @@
         try {// Can throw several exceptions
             if(Configuration.get("general.use_proxy", true)) {
+                // These are Java properties, therefore see
+                // https://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html
+                // https://docs.oracle.com/javase/8/docs/technotes/guides/net/proxies.html
+                // https://stackoverflow.com/questions/14243590/proxy-settings-in-java
+
+                // Not sure what proxyType is. And proxySet ceased to exist since JDK 6 or before
                 System.setProperty("http.proxyType", "4");
-                System.setProperty("http.proxyHost", Configuration.getString("general.proxy_host", true));
-                System.setProperty("http.proxyPort", Configuration.getString("general.proxy_port", true));
-                System.setProperty("http.proxySet", "true");
+                System.setProperty("http.proxyHost", Configuration.getString("general.HTTP_proxy_host", true));
+                System.setProperty("http.proxyPort", Configuration.getString("general.HTTP_proxy_port", true));
+                //System.setProperty("http.proxySet", "true");
+                
+                System.setProperty("https.proxyHost", Configuration.getString("general.HTTPS_proxy_host", true));
+                System.setProperty("https.proxyPort", Configuration.getString("general.HTTPS_proxy_port", true));
+
+                System.setProperty("ftp.proxyHost", Configuration.getString("general.FTP_proxy_host", true));
+                System.setProperty("ftp.proxyPort", Configuration.getString("general.FTP_proxy_port", true));
+                
             } else {
                 System.setProperty("http.proxyHost", "");
                 System.setProperty("http.proxyPort", "");
-                System.setProperty("http.proxySet", "false");
+                //System.setProperty("http.proxySet", "false");
+                System.setProperty("https.proxyHost", "");
+                System.setProperty("https.proxyPort", "");
+                System.setProperty("ftp.proxyHost", "");
+                System.setProperty("ftp.proxyPort", "");
             }
         } catch (Exception error) {