svn commit: r1727516 - in /jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3: S3Backend.java Utils.java

[amitj]

Author: amitj
Date: Fri Jan 29 10:29:38 2016
New Revision: 1727516

URL: http://svn.apache.org/viewvc?rev=1727516&view=rev
Log:
OAK-3954: [oak-blob-cloud] Update oak-blob-cloud with jackrabbit-aws-ext updates

Ported relevant update for issue JCR-3886 (1687897)

Modified:
    
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
    
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java?rev=1727516&r1=1727515&r2=1727516&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
 Fri Jan 29 10:29:38 2016
@@ -228,7 +228,7 @@ public class S3Backend implements Shared
             ObjectMetadata objectMetaData = s3service.getObjectMetadata(bucket,
                 key);
             if (objectMetaData != null) {
-                LOG.debug("exists [{}]: [true] took [{}] ms.",
+                LOG.trace("exists [{}]: [true] took [{}] ms.",
                     identifier, (System.currentTimeMillis() - start) );
                 return true;
             }
@@ -354,7 +354,7 @@ public class S3Backend implements Shared
                 LOG.debug("[{}] touched. time taken [{}] ms ", new Object[] {
                     identifier, (System.currentTimeMillis() - start) });
             } else {
-                LOG.debug("[{}] touch not required. time taken [{}] ms ",
+                LOG.trace("[{}] touch not required. time taken [{}] ms ",
                     new Object[] { identifier,
                         (System.currentTimeMillis() - start) });
             }

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=1727516&r1=1727515&r2=1727516&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:38 2016
@@ -35,6 +35,7 @@ import com.amazonaws.services.s3.AmazonS
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.util.StringUtils;
 
 /**
  * Amazon S3 utilities.
@@ -77,10 +78,20 @@ public final class Utils {
      * @return {@link AmazonS3Client}
      */
     public static AmazonS3Client openService(final Properties prop) {
-        AWSCredentials credentials = new BasicAWSCredentials(
-            prop.getProperty(S3Constants.ACCESS_KEY),
-            prop.getProperty(S3Constants.SECRET_KEY));
-        AmazonS3Client s3service =  new AmazonS3Client(credentials, 
getClientConfiguration(prop));
+        String accessKey = prop.getProperty(S3Constants.ACCESS_KEY);
+        String secretKey = prop.getProperty(S3Constants.SECRET_KEY);
+        AmazonS3Client s3service = null;
+        if (StringUtils.isNullOrEmpty(accessKey)
+                || StringUtils.isNullOrEmpty(secretKey)) {
+            LOG.info("Configuring Amazon Client from environment");
+            s3service = new AmazonS3Client(getClientConfiguration(prop));
+        } else {
+            LOG.info("Configuring Amazon Client from property file.");
+            AWSCredentials credentials = new BasicAWSCredentials(accessKey,
+                    secretKey);
+            s3service = new AmazonS3Client(credentials,
+                    getClientConfiguration(prop));
+        }
         String region = prop.getProperty(S3Constants.S3_REGION);
         String endpoint = null;
         String propEndPoint = prop.getProperty(S3Constants.S3_END_POINT);