You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by sh...@apache.org on 2015/09/15 06:08:50 UTC
svn commit: r1703093 - in /jackrabbit/trunk/jackrabbit-aws-ext/src:
main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
main/java/org/apache/jackrabbit/aws/ext/Utils.java
test/resources/aws.properties
Author: shashank
Date: Tue Sep 15 04:08:50 2015
New Revision: 1703093
URL: http://svn.apache.org/r1703093
Log:
JCR-3889 [jackrabbit-aws-ext] Can't configure proxy properties to access Amazon S3
Patch from Ana Eliza Barbosa applied.
Modified:
jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
jackrabbit/trunk/jackrabbit-aws-ext/src/test/resources/aws.properties
Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java?rev=1703093&r1=1703092&r2=1703093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java Tue Sep 15 04:08:50 2015
@@ -98,6 +98,16 @@ public final class S3Constants {
public static final String S3_ENCRYPTION_SSE_S3 = "SSE_S3";
/**
+ * Constant to set proxy host.
+ */
+ public static final String PROXY_HOST = "proxyHost";
+
+ /**
+ * Constant to set proxy port.
+ */
+ public static final String PROXY_PORT = "proxyPort";
+
+ /**
* private constructor so that class cannot initialized from outside.
*/
private S3Constants() {
Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java?rev=1703093&r1=1703092&r2=1703093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java Tue Sep 15 04:08:50 2015
@@ -184,15 +184,30 @@ public final class Utils {
int socketTimeOut = Integer.parseInt(prop.getProperty(S3Constants.S3_SOCK_TIMEOUT));
int maxConnections = Integer.parseInt(prop.getProperty(S3Constants.S3_MAX_CONNS));
int maxErrorRetry = Integer.parseInt(prop.getProperty(S3Constants.S3_MAX_ERR_RETRY));
- ClientConfiguration cc = new ClientConfiguration();
+
String protocol = prop.getProperty(S3Constants.S3_CONN_PROTOCOL);
+ String proxyHost = prop.getProperty(S3Constants.PROXY_HOST);
+ String proxyPort = prop.getProperty(S3Constants.PROXY_PORT);
+
+ ClientConfiguration cc = new ClientConfiguration();
+
if (protocol != null && protocol.equalsIgnoreCase("http")) {
cc.setProtocol(Protocol.HTTP);
}
+
+ if (proxyHost != null && !proxyHost.isEmpty()) {
+ cc.setProxyHost(proxyHost);
+ }
+
+ if (proxyPort != null && !proxyPort.isEmpty()) {
+ cc.setProxyPort(Integer.parseInt(proxyPort));
+ }
+
cc.setConnectionTimeout(connectionTimeOut);
cc.setSocketTimeout(socketTimeOut);
cc.setMaxConnections(maxConnections);
cc.setMaxErrorRetry(maxErrorRetry);
+
return cc;
}
Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/test/resources/aws.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/test/resources/aws.properties?rev=1703093&r1=1703092&r2=1703093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/test/resources/aws.properties (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/test/resources/aws.properties Tue Sep 15 04:08:50 2015
@@ -42,4 +42,6 @@ maxConnections=20
maxErrorRetry=10
# maximum concurrent threads to write to S3.
writeThreads=10
-
+# proxy configurations (optional)
+proxyHost=
+proxyPort=
\ No newline at end of file