Author: cmueller
Date: Mon Dec 12 22:03:01 2011
New Revision: 1213462
URL: http://svn.apache.org/viewvc?rev=1213462&view=rev
Log:
CAMEL-4721: Upgrade com.amazonaws:aws-java-sdk 1.1.1 -> 1.2.12
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonS3ClientMock.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSNSClientMock.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSQSClientMock.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonS3ClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonS3ClientMock.java?rev=1213462&r1=1213461&r2=1213462&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonS3ClientMock.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonS3ClientMock.java
Mon Dec 12 22:03:01 2011
@@ -27,8 +27,7 @@ import com.amazonaws.AmazonClientExcepti
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.HttpMethod;
-import com.amazonaws.Request;
-import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.S3ResponseMetadata;
import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
@@ -79,7 +78,7 @@ public class AmazonS3ClientMock extends
List<S3Object> objects = new ArrayList<S3Object>();
public AmazonS3ClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
@@ -421,14 +420,4 @@ public class AmazonS3ClientMock extends
public S3ResponseMetadata
getCachedResponseMetadata(AmazonWebServiceRequest request) {
throw new UnsupportedOperationException();
}
-
- @Override
- protected Request<Void> createRequest(String bucketName, String key,
AmazonWebServiceRequest originalRequest) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected <T> void signRequest(Request<T> request, HttpMethodName
methodName, String bucketName, String key) {
- throw new UnsupportedOperationException();
- }
}
\ No newline at end of file
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSNSClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSNSClientMock.java?rev=1213462&r1=1213461&r2=1213462&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSNSClientMock.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSNSClientMock.java
Mon Dec 12 22:03:01 2011
@@ -20,6 +20,7 @@ import com.amazonaws.AmazonClientExcepti
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
+import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.sns.AmazonSNSClient;
import com.amazonaws.services.sns.model.AddPermissionRequest;
import com.amazonaws.services.sns.model.ConfirmSubscriptionRequest;
@@ -46,7 +47,7 @@ import com.amazonaws.services.sns.model.
public class AmazonSNSClientMock extends AmazonSNSClient {
public AmazonSNSClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSQSClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSQSClientMock.java?rev=1213462&r1=1213461&r2=1213462&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSQSClientMock.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AmazonSQSClientMock.java
Mon Dec 12 22:03:01 2011
@@ -23,6 +23,7 @@ import java.util.List;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
+import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.sqs.AmazonSQSClient;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
import com.amazonaws.services.sqs.model.CreateQueueResult;
@@ -38,7 +39,7 @@ public class AmazonSQSClientMock extends
List<Message> messages = new ArrayList<Message>();
public AmazonSQSClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java?rev=1213462&r1=1213461&r2=1213462&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
Mon Dec 12 22:03:01 2011
@@ -27,8 +27,6 @@ import org.apache.camel.component.aws.s3
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import
org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java?rev=1213462&r1=1213461&r2=1213462&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
Mon Dec 12 22:03:01 2011
@@ -22,8 +22,6 @@ import org.apache.camel.Processor;
import org.apache.camel.component.aws.sns.SnsConstants;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import
org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
