hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #428 from KevinVdV/DS-1832

Browse Source 
[DS-1832] Proxy configuration set in system properties if empty
This commit is contained in:
Bram Luyten
2013-12-21 03:11:25 -08:00
parent f9948565b0 84d6833192
commit 38a7f17758
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
View File

@@ -25,6 +25,7 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException; import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser; import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
@@ -316,8 +317,8 @@ public class GenerateSitemaps
throws MalformedURLException, UnsupportedEncodingException throws MalformedURLException, UnsupportedEncodingException
{ {
// Set up HTTP proxy // Set up HTTP proxy
if ((ConfigurationManager.getProperty("http.proxy.host") != null) if ((StringUtils.isNotBlank(ConfigurationManager.getProperty("http.proxy.host")))
&& (ConfigurationManager.getProperty("http.proxy.port") != null)) && (StringUtils.isNotBlank(ConfigurationManager.getProperty("http.proxy.port"))))
{ {
System.setProperty("proxySet", "true"); System.setProperty("proxySet", "true");
System.setProperty("proxyHost", ConfigurationManager System.setProperty("proxyHost", ConfigurationManager

3
dspace-api/src/main/java/org/dspace/license/CreativeCommons.java
View File

@@ -20,6 +20,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Bitstream; import org.dspace.content.Bitstream;
@@ -61,7 +62,7 @@ public class CreativeCommons
String proxyHost = ConfigurationManager.getProperty("http.proxy.host"); String proxyHost = ConfigurationManager.getProperty("http.proxy.host");
String proxyPort = ConfigurationManager.getProperty("http.proxy.port"); String proxyPort = ConfigurationManager.getProperty("http.proxy.port");
if ((proxyHost != null) && (proxyPort != null)) if (StringUtils.isNotBlank(proxyHost) && StringUtils.isNotBlank(proxyPort))
{ {
System.setProperty("http.proxyHost", proxyHost); System.setProperty("http.proxyHost", proxyHost);
System.setProperty("http.proxyPort", proxyPort); System.setProperty("http.proxyPort", proxyPort);