Author: cmueller
Date: Mon Dec 12 20:42:14 2011
New Revision: 1213431
URL: http://svn.apache.org/viewvc?rev=1213431&view=rev
Log:
CAMEL-4721: Upgrade com.amazonaws:aws-java-sdk 1.1.1 -> 1.2.12
Thank you Bilgin for the patch
Modified:
camel/trunk/components/camel-aws/pom.xml
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Mon Dec 12 20:42:14 2011
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.1.1</version>
+ <version>1.2.12</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
(original)
+++
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
Mon Dec 12 20:42:14 2011
@@ -77,9 +77,6 @@ public class SqsEndpoint extends Schedul
// creates a new queue, or returns the URL of an existing one
CreateQueueRequest request = new
CreateQueueRequest(configuration.getQueueName());
- if (getConfiguration().getDefaultVisibilityTimeout() != null) {
-
request.setDefaultVisibilityTimeout(getConfiguration().getDefaultVisibilityTimeout());
- }
LOG.trace("Creating queue [{}] with request [{}]...",
configuration.getQueueName(), request);
@@ -89,6 +86,9 @@ public class SqsEndpoint extends Schedul
LOG.trace("Queue created and available at: {}", queueUrl);
// According to the documentation, only one setting can be made at a
time, even though they go into a Map.
+ if (getConfiguration().getDefaultVisibilityTimeout() != null) {
+ updateAttribute("VisibilityTimeout",
getConfiguration().getDefaultVisibilityTimeout());
+ }
if (getConfiguration().getMaximumMessageSize() != null) {
updateAttribute("MaximumMessageSize",
getConfiguration().getMaximumMessageSize());
}
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
Mon Dec 12 20:42:14 2011
@@ -29,8 +29,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;
@@ -84,7 +83,7 @@ public class AmazonS3ClientMock extends
private boolean nonExistingBucketCreated;
public AmazonS3ClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
@@ -439,14 +438,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/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
Mon Dec 12 20:42:14 2011
@@ -22,6 +22,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;
@@ -50,7 +51,7 @@ public class AmazonSNSClientMock extends
private static final String DEFAULT_TOPIC_ARN =
"arn:aws:sns:us-east-1:541925086079:MyTopic";
public AmazonSNSClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
Mon Dec 12 20:42:14 2011
@@ -25,6 +25,7 @@ import java.util.Map;
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;
@@ -42,7 +43,7 @@ public class AmazonSQSClientMock extends
Map<String, Map<String, String>> queueAttributes = new HashMap<String,
Map<String, String>>();
public AmazonSQSClientMock() {
- super(null);
+ super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
@Override
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Dec 12 20:42:14 2011
@@ -38,7 +38,7 @@
<antlr-bundle-version>2.7.7_2</antlr-bundle-version>
<aopalliance-bundle-version>1.0_5</aopalliance-bundle-version>
<asm2-bundle-version>2.2.3_4</asm2-bundle-version>
- <aws-java-sdk-bundle-version>1.1.1_2</aws-java-sdk-bundle-version>
+ <aws-java-sdk-bundle-version>1.2.12_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<bcpg-jdk16-bundle-version>1.46_1</bcpg-jdk16-bundle-version>
<cglib-version>2.1_3_6</cglib-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1213431&r1=1213430&r2=1213431&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Dec 12 20:42:14 2011
@@ -159,7 +159,8 @@
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-aws' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle
dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
