You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/24 21:20:53 UTC
[10/19] git commit: Replaced amazon libs with JCLOUD libs. Amazon lib
broke the rest tier and cannot be used until further testing is done.
Replaced amazon libs with JCLOUD libs. Amazon lib broke the rest tier and cannot be used until further testing is done.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f9456169
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f9456169
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f9456169
Branch: refs/heads/master
Commit: f9456169437d940c4ab3e3a12c9f91cdccff758d
Parents: 79dc2c5
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 23:03:00 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 23:03:00 2014 -0700
----------------------------------------------------------------------
stack/services/pom.xml | 12 ---
.../cassandra/ManagementServiceIT.java | 87 +++++++++++++++-----
2 files changed, 66 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f9456169/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index de02659..4c9f802 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -448,7 +448,6 @@
<artifactId>tika-core</artifactId>
</dependency>
-
<!-- Testing and Logging Dependencies -->
<dependency>
<!--
@@ -554,17 +553,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.3</version>
- </dependency>
-
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.7.3</version>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f9456169/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 44e0277..8000b25 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -23,8 +23,17 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.UUID;
-
+import java.util.concurrent.TimeUnit;
+
+import org.jclouds.ContextBuilder;
+import org.jclouds.blobstore.AsyncBlobStore;
+import org.jclouds.blobstore.BlobStoreContext;
+import org.jclouds.blobstore.domain.Blob;
+import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.netty.config.NettyPayloadModule;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.junit.BeforeClass;
@@ -65,12 +74,9 @@ import org.apache.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.S3Object;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.apache.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
@@ -83,6 +89,13 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+//import com.amazonaws.auth.AWSCredentials;
+//import com.amazonaws.auth.BasicAWSCredentials;
+//import com.amazonaws.services.s3.AmazonS3;
+//import com.amazonaws.services.s3.AmazonS3Client;
+//import com.amazonaws.services.s3.model.GetObjectRequest;
+//import com.amazonaws.services.s3.model.S3Object;
+
/** @author zznate */
@@ -1519,18 +1532,34 @@ public class ManagementServiceIT {
exportService.doExport( jobExecution );
while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
- AWSCredentials myCredentials = new BasicAWSCredentials(
- System.getProperty( "accessKey" ), System.getProperty("secretKey"));
- AmazonS3 s3client = new AmazonS3Client(myCredentials);
- S3Object sd = null;
+ String bucketName = System.getProperty( "bucketName" );
+ String accessId = System.getProperty( "accessKey" );
+ String secretKey = System.getProperty("secretKey");
+
+ Properties overrides = new Properties();
+ overrides.setProperty( "s3" + ".identity", accessId );
+ overrides.setProperty( "s3" + ".credential", secretKey );
+
+ Blob bo = null;
+
try {
- sd = s3client.getObject( new GetObjectRequest( System.getProperty( "bucketName" ),
- s3Export.getFilename()) );
+ final Iterable<? extends Module> MODULES = ImmutableSet
+ .of( new JavaUrlHttpCommandExecutorServiceModule(), new Log4JLoggingModule(), new NettyPayloadModule
+ () );
+
+ BlobStoreContext context =
+ ContextBuilder.newBuilder( "s3" ).credentials( accessId, secretKey ).modules( MODULES )
+ .overrides( overrides ).buildView( BlobStoreContext.class );
+
+
+ AsyncBlobStore blobStore = context.getAsyncBlobStore();
+ ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
+ bo = futureETag.get( 1, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}
- assertNotNull( sd );
+ assertNotNull( bo );
}
//@Ignore("I'd have to add some overhead such that I loop through all files or keep track of them all ")
@@ -1594,17 +1623,33 @@ public class ManagementServiceIT {
exportService.doExport( jobExecution );
while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
- AWSCredentials myCredentials = new BasicAWSCredentials(
- System.getProperty( "accessKey" ), System.getProperty("secretKey"));
- AmazonS3 s3client = new AmazonS3Client(myCredentials);
- S3Object sd = null;
+ String bucketName = System.getProperty( "bucketName" );
+ String accessId = System.getProperty( "accessKey" );
+ String secretKey = System.getProperty("secretKey");
+
+ Properties overrides = new Properties();
+ overrides.setProperty( "s3" + ".identity", accessId );
+ overrides.setProperty( "s3" + ".credential", secretKey );
+ Blob bo = null;
+
try {
- sd = s3client.getObject( new GetObjectRequest( System.getProperty( "bucketName" ),
- s3Export.getFilename()) );
+ final Iterable<? extends Module> MODULES = ImmutableSet
+ .of( new JavaUrlHttpCommandExecutorServiceModule(), new Log4JLoggingModule(), new NettyPayloadModule
+ () );
+
+ BlobStoreContext context =
+ ContextBuilder.newBuilder( "s3" ).credentials( accessId, secretKey ).modules( MODULES )
+ .overrides( overrides ).buildView( BlobStoreContext.class );
+
+
+ AsyncBlobStore blobStore = context.getAsyncBlobStore();
+ ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
+ bo = futureETag.get( 1, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}
- assertNotNull( sd );
+
+ assertNotNull( bo );
}
/*Creates fake payload for testing purposes.*/