You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2021/11/09 10:37:55 UTC
svn commit: r1894859 - in /jackrabbit/branches/2.16: ./
jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
Author: reschke
Date: Tue Nov 9 10:37:55 2021
New Revision: 1894859
URL: http://svn.apache.org/viewvc?rev=1894859&view=rev
Log:
JCR-3928: Enable pathStyleAccess in AWS Client (patch by Andrei Filimonov and Piet de Nooijer) (merged r1891015 into 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1891015
Modified: jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java?rev=1894859&r1=1894858&r2=1894859&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java Tue Nov 9 10:37:55 2021
@@ -108,6 +108,11 @@ public final class S3Constants {
public static final String PROXY_PORT = "proxyPort";
/**
+ * Path style access flag true/false
+ */
+ public static final String S3_PATH_STYLE_ACCESS = "pathStyleAccess";
+
+ /**
* private constructor so that class cannot initialized from outside.
*/
private S3Constants() {
Modified: jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java?rev=1894859&r1=1894858&r2=1894859&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java Tue Nov 9 10:37:55 2021
@@ -34,6 +34,7 @@ import com.amazonaws.auth.BasicAWSCreden
import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.S3ClientOptions;
import com.amazonaws.services.s3.model.ObjectListing;
import com.amazonaws.services.s3.model.Region;
import com.amazonaws.services.s3.model.S3ObjectSummary;
@@ -126,6 +127,7 @@ public final class Utils {
*/
s3service.setEndpoint(endpoint);
LOG.info("S3 service endpoint [{}] ", endpoint);
+ s3service.setS3ClientOptions(getS3ClientOptions(prop));
return s3service;
}
@@ -224,4 +226,8 @@ public final class Utils {
return cc;
}
+ private static S3ClientOptions getS3ClientOptions(Properties prop) {
+ boolean pathStyleAccess = Boolean.parseBoolean(prop.getProperty(S3Constants.S3_PATH_STYLE_ACCESS));
+ return S3ClientOptions.builder().setPathStyleAccess(pathStyleAccess).build();
+ }
}