Updated Branches:
refs/heads/master f74e28160 -> 5ecbfe920
Update to qpid 0.24. Expand test to test both 0.10/0.9 client and the new 1.0
client.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ecbfe92
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ecbfe92
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ecbfe92
Branch: refs/heads/master
Commit: 5ecbfe920eefe7336092c1d623f579230db08a00
Parents: f74e281
Author: Daniel Kulp <[email protected]>
Authored: Fri Feb 7 13:05:30 2014 -0500
Committer: Daniel Kulp <[email protected]>
Committed: Fri Feb 7 13:09:57 2014 -0500
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 10 +++++----
.../camel/component/amqp/AMQPComponent.java | 22 ++++++++++++++++----
.../camel/component/amqp/AMQPRouteTest.java | 19 ++++++++++-------
.../camel-amqp/src/test/resources/config.json | 2 +-
parent/pom.xml | 2 +-
5 files changed, 38 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5ecbfe92/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index bdd9d3c..e054f8d 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -46,13 +46,15 @@
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-client</artifactId>
+ <artifactId>qpid-amqp-1-0-client-jms</artifactId>
<version>${qpid-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-common</artifactId>
- <version>${qpid-version}</version>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${qpid-version}</version>
+ <optional>true</optional>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/5ecbfe92/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index cfd77e0..cd37132 100644
---
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -16,10 +16,16 @@
*/
package org.apache.camel.component.amqp;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+
+import javax.jms.ConnectionFactory;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.JmsConfiguration;
+import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.url.URLSyntaxException;
@@ -41,13 +47,21 @@ public class AMQPComponent extends JmsComponent {
super(context);
}
- public AMQPComponent(AMQConnectionFactory connectionFactory) {
+ public AMQPComponent(ConnectionFactory connectionFactory) {
setConnectionFactory(connectionFactory);
}
- public static Component amqpComponent(String uri) throws URLSyntaxException {
- AMQConnectionFactory connectionFactory = new AMQConnectionFactory(uri);
- return new AMQPComponent(connectionFactory);
+ public static Component amqpComponent(String uri, boolean old) throws
MalformedURLException, URISyntaxException {
+ if (old) {
+ return amqpComponentOld(uri);
+ }
+ return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
+ }
+ public static Component amqpComponentOld(String uri) throws
URISyntaxException {
+ return new AMQPComponent(new AMQConnectionFactory(uri));
+ }
+ public static Component amqpComponent(String uri) throws
MalformedURLException {
+ return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ecbfe92/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git
a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 2a67cdb..952ea7f 100644
---
a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++
b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -40,15 +40,16 @@ public class AMQPRouteTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
+ template.sendBodyAndHeader("amqp0-9:queue:ping", expectedBody,
"cheese", 123);
+ resultEndpoint.assertIsSatisfied();
- sendExchange(expectedBody);
-
+ resultEndpoint.reset();
+ resultEndpoint.expectedMessageCount(1);
+ resultEndpoint.message(0).header("cheese").isEqualTo(123);
+ template.sendBodyAndHeader("amqp1-0:queue:ping", expectedBody,
"cheese", 123);
resultEndpoint.assertIsSatisfied();
}
- protected void sendExchange(final Object expectedBody) {
- template.sendBodyAndHeader("amqp:queue:ping", expectedBody, "cheese",
123);
- }
@Before
public void setUp() throws Exception {
@@ -72,14 +73,18 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp",
amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'"));
+ camelContext.addComponent("amqp0-9",
amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'", true));
+ camelContext.addComponent("amqp1-0",
amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'", false));
return camelContext;
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("amqp:queue:ping")
+ from("amqp0-9:queue:ping")
+ .to("log:routing")
+ .to("mock:result");
+ from("amqp1-0:queue:ping")
.to("log:routing")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ecbfe92/components/camel-amqp/src/test/resources/config.json
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/resources/config.json
b/components/camel-amqp/src/test/resources/config.json
index f15ab94..915f325 100644
--- a/components/camel-amqp/src/test/resources/config.json
+++ b/components/camel-amqp/src/test/resources/config.json
@@ -1,6 +1,6 @@
{
"name": "Broker",
- "defaultVirtualHost": "default",
+ "defaultVirtualHost": "test",
"modelVersion": "1.0",
"storeVersion": 1,
"authenticationproviders": [
http://git-wip-us.apache.org/repos/asf/camel/blob/5ecbfe92/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d37b91..c1b124d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,7 +333,7 @@
<protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
<protobuf-version>2.3.0</protobuf-version>
<qpid-bundle-version>0.22_1</qpid-bundle-version>
- <qpid-version>0.22</qpid-version>
+ <qpid-version>0.24</qpid-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz2-version>2.2.1</quartz2-version>
