Author: davsclaus
Date: Thu Jan 13 05:42:55 2011
New Revision: 1058409
URL: http://svn.apache.org/viewvc?rev=1058409&view=rev
Log:
CAMEL-3536: camel-aws sks component uses aws- preifx in scheme component nane.
Added:
camel/trunk/components/camel-aws/src/main/resources/META-INF/services/org/apache/camel/component/aws-sqs
- copied unchanged from r1058408,
camel/trunk/components/camel-aws/src/main/resources/META-INF/services/org/apache/camel/component/sqs
Removed:
camel/trunk/components/camel-aws/src/main/resources/META-INF/services/org/apache/camel/component/sqs
Modified:
camel/trunk/components/camel-aws/ (props changed)
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
camel/trunk/components/camel-aws/src/test/resources/log4j.properties
camel/trunk/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml
Propchange: camel/trunk/components/camel-aws/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jan 13 05:42:55 2011
@@ -1,3 +1,9 @@
+eclipse-classes
+.pmd
+.checkstyle
+.project
+.classpath
target
-
.settings
+activemq-data
+*.i??
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
(original)
+++
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
Thu Jan 13 05:42:55 2011
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
/**
* A Consumer of messages from the Amazon Web Service Simple Queue Service
- * <a href="http://aws.amazon.com/sqs/";>AWS SQS</a>
+ * <a href="http://aws.amazon.com/aws-sqs/";>AWS SQS</a>
*
* @version $Revision: $
*/
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
(original)
+++
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
Thu Jan 13 05:42:55 2011
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
/**
* A Producer which sends messages to the Amazon Web Service Simple Queue
Service
- * <a href="http://aws.amazon.com/sqs/";>AWS SQS</a>
+ * <a href="http://aws.amazon.com/aws-sqs/";>AWS SQS</a>
*
* @version $Revision: $
*/
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
Thu Jan 13 05:42:55 2011
@@ -76,7 +76,7 @@ public class SqsBatchConsumerTest extend
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("sqs://MyQueue?amazonSQSClient=#amazonSQSClient&delay=5000&maxMessagesPerPoll=5")
+
from("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient&delay=5000&maxMessagesPerPoll=5")
.to("mock:result");
}
};
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
Thu Jan 13 05:42:55 2011
@@ -29,7 +29,7 @@ public class SqsComponentConfigurationTe
@Test
public void createEndpointWithMinimalConfiguration() throws Exception {
SqsComponent component = new SqsComponent(context);
- SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("sqs://MyQueue?accessKey=xxx&secretKey=yyy");
+ SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy");
assertEquals("MyQueue", endpoint.getConfiguration().getQueueName());
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
@@ -47,7 +47,7 @@ public class SqsComponentConfigurationTe
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry)
context.getRegistry()).getRegistry()).bind("amazonSQSClient", mock);
SqsComponent component = new SqsComponent(context);
- SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("sqs://MyQueue?amazonSQSClient=#amazonSQSClient");
+ SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient");
assertEquals("MyQueue", endpoint.getConfiguration().getQueueName());
assertNull(endpoint.getConfiguration().getAccessKey());
@@ -67,7 +67,7 @@ public class SqsComponentConfigurationTe
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry)
context.getRegistry()).getRegistry()).bind("attributeNames", attributeNames);
SqsComponent component = new SqsComponent(context);
- SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("sqs://MyQueue?accessKey=xxx&secretKey=yyy&attributeNames=#attributeNames"
+ SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy&attributeNames=#attributeNames"
+ "&DefaultVisibilityTimeout=1000&visibilityTimeout=2000");
assertEquals("MyQueue", endpoint.getConfiguration().getQueueName());
@@ -82,7 +82,7 @@ public class SqsComponentConfigurationTe
@Test
public void createEndpointWithPollConsumerConfiguration() throws Exception
{
SqsComponent component = new SqsComponent(context);
- SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("sqs://MyQueue?accessKey=xxx&secretKey=yyy&initialDelay=300&delay=400&maxMessagesPerPoll=50");
+ SqsEndpoint endpoint = (SqsEndpoint)
component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy&initialDelay=300&delay=400&maxMessagesPerPoll=50");
SqsConsumer consumer = (SqsConsumer) endpoint.createConsumer(null);
assertEquals(300, consumer.getInitialDelay());
@@ -93,12 +93,12 @@ public class SqsComponentConfigurationTe
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutAccessKeyConfiguration() throws Exception
{
SqsComponent component = new SqsComponent(context);
- component.createEndpoint("sqs://MyQueue?secretKey=yyy");
+ component.createEndpoint("aws-sqs://MyQueue?secretKey=yyy");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutSecretKeyConfiguration() throws Exception
{
SqsComponent component = new SqsComponent(context);
- component.createEndpoint("sqs://MyQueue?accessKey=xxx");
+ component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
Thu Jan 13 05:42:55 2011
@@ -97,9 +97,9 @@ public class SqsComponentTest extends Ca
@Override
public void configure() throws Exception {
from("direct:start")
- .to("sqs://MyQueue?amazonSQSClient=#amazonSQSClient");
+ .to("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient");
- from("sqs://MyQueue?amazonSQSClient=#amazonSQSClient")
+ from("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient")
.to("mock:result");
}
};
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
Thu Jan 13 05:42:55 2011
@@ -89,9 +89,9 @@ public class SqsComponentIntegrationTest
@Override
public void configure() throws Exception {
from("direct:start")
- .to("sqs://MyQueue?accessKey=xxx&secretKey=yyy");
+ .to("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy");
- from("sqs://MyQueue?accessKey=xxx&secretKey=yyy")
+ from("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy")
.to("mock:result");
}
};
Modified: camel/trunk/components/camel-aws/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/resources/log4j.properties?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-aws/src/test/resources/log4j.properties Thu
Jan 13 05:42:55 2011
@@ -21,7 +21,7 @@
log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel.component.aws=TRACE
-log4j.logger.org.apache.camel=INFO
+#log4j.logger.org.apache.camel=INFO
# CONSOLE appender not used by default
Modified:
camel/trunk/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml?rev=1058409&r1=1058408&r2=1058409&view=diff
==============================================================================
---
camel/trunk/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml
(original)
+++
camel/trunk/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml
Thu Jan 13 05:42:55 2011
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
- -->
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under
+ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and
+ limitations under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
- <route>
- <from uri="direct:start" />
- <to uri="sqs://MyQueue?amazonSQSClient=#amazonSQSClient" />
- </route>
-
- <route>
- <from uri="sqs://MyQueue?amazonSQSClient=#amazonSQSClient" />
- <to uri="mock:result" />
- </route>
- </camelContext>
-
- <bean id="amazonSQSClient"
class="org.apache.camel.component.aws.sqs.AmazonSQSClientMock" />
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <to uri="aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient"/>
+ </route>
+
+ <route>
+ <from uri="aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient"/>
+ <to uri="mock:result"/>
+ </route>
+ </camelContext>
+
+ <bean id="amazonSQSClient"
class="org.apache.camel.component.aws.sqs.AmazonSQSClientMock"/>
</beans>
\ No newline at end of file
