Author: cmueller
Date: Mon Dec 12 21:16:24 2011
New Revision: 1213444
URL: http://svn.apache.org/viewvc?rev=1213444&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/branches/camel-2.7.x/components/camel-aws/pom.xml
camel/branches/camel-2.7.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
camel/branches/camel-2.7.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.7.x/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-aws/pom.xml?rev=1213444&r1=1213443&r2=1213444&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-aws/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-aws/pom.xml Mon Dec 12 21:16:24
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>
</dependency>
<!-- for testing -->
Modified:
camel/branches/camel-2.7.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java?rev=1213444&r1=1213443&r2=1213444&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
Mon Dec 12 21:16:24 2011
@@ -23,6 +23,7 @@ import com.amazonaws.auth.BasicAWSCreden
import com.amazonaws.services.sqs.AmazonSQSClient;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
import com.amazonaws.services.sqs.model.CreateQueueResult;
+import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
@@ -75,7 +76,6 @@ public class SqsEndpoint extends Schedul
// creates a new queue, or returns the URL of an existing one
CreateQueueRequest request = new
CreateQueueRequest(configuration.getQueueName());
-
request.setDefaultVisibilityTimeout(getConfiguration().getDefaultVisibilityTimeout()
!= null ? getConfiguration().getDefaultVisibilityTimeout() : null);
if (LOG.isTraceEnabled()) {
LOG.trace("Creating queue [" + configuration.getQueueName() + "]
with request [" + request + "]...");
@@ -83,12 +83,27 @@ public class SqsEndpoint extends Schedul
CreateQueueResult queueResult = client.createQueue(request);
queueUrl = queueResult.getQueueUrl();
-
- if (LOG.isTraceEnabled()) {
- LOG.trace("Queue created and available at: " + queueUrl);
+
+ 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());
}
}
+ protected void updateAttribute(String attribute, Object value) {
+ SetQueueAttributesRequest setQueueAttributesRequest = new
SetQueueAttributesRequest();
+ setQueueAttributesRequest.setQueueUrl(queueUrl);
+ setQueueAttributesRequest.getAttributes().put(attribute,
String.valueOf(value));
+
+ LOG.trace("Updating queue [{}] with request: {}",
configuration.getQueueName(), setQueueAttributesRequest);
+
+ client.setQueueAttributes(setQueueAttributesRequest);
+
+ LOG.trace("Queue updated");
+ }
+
@Override
protected void doStop() throws Exception {
client = null;
Modified:
camel/branches/camel-2.7.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java?rev=1213444&r1=1213443&r2=1213444&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
Mon Dec 12 21:16:24 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/branches/camel-2.7.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml?rev=1213444&r1=1213443&r2=1213444&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml Mon Dec 12
21:16:24 2011
@@ -38,7 +38,7 @@
<antlr-bundle-version>2.7.7_2</antlr-bundle-version>
<aopalliance-bundle-version>1.0_3</aopalliance-bundle-version>
<asm-bundle-version>2.2.3_3</asm-bundle-version>
- <aws-java-sdk-bundle-version>1.1.1_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-bundle-version>1.2.12_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_2</bcel-bundle-version>
<cglib-version>2.1_3_6</cglib-version>
<cometd-java-server-bundle-version>1.0.1_1</cometd-java-server-bundle-version>
Modified:
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1213444&r1=1213443&r2=1213444&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Mon Dec 12 21:16:24 2011
@@ -174,7 +174,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>
