Author: amitj
Date: Fri Jan 29 10:29:59 2016
New Revision: 1727517
URL: http://svn.apache.org/viewvc?rev=1727517&view=rev
Log:
OAK-3954: [oak-blob-cloud] Update oak-blob-cloud with jackrabbit-aws-ext updates
Ported relevant update for issue JCR-3889 (1703093)
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/aws.properties
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java?rev=1727517&r1=1727516&r2=1727517&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java
Fri Jan 29 10:29:59 2016
@@ -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/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java?rev=1727517&r1=1727516&r2=1727517&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
Fri Jan 29 10:29:59 2016
@@ -184,11 +184,25 @@ 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);
Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/aws.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/aws.properties?rev=1727517&r1=1727516&r2=1727517&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/aws.properties
(original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/aws.properties Fri
Jan 29 10:29:59 2016
@@ -42,4 +42,6 @@ maxConnections=20
maxErrorRetry=10
# maximum concurrent threads to write to S3.
writeThreads=10
-
+# proxy configurations (optional)
+proxyHost=
+proxyPort=
