You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/10 13:59:27 UTC
[4/6] git commit: Upgraded apid
Upgraded apid
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbc6dcce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbc6dcce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbc6dcce
Branch: refs/heads/master
Commit: dbc6dcce931860dc4b9f3d2c4de3c32259c609d7
Parents: 23496f3
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:57:36 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:57:36 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/amqp/AMQPComponent.java | 4 ++--
.../test/java/org/apache/camel/component/amqp/AMQPRouteTest.java | 3 ++-
parent/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dbc6dcce/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 710158e..e889a85 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
@@ -30,8 +30,6 @@ import org.apache.qpid.client.AMQConnectionFactory;
/**
* This component supports the AMQP protocol using the Client API of the Apache Qpid project.
- *
- * @version
*/
public class AMQPComponent extends JmsComponent {
@@ -56,9 +54,11 @@ public class AMQPComponent extends JmsComponent {
}
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/dbc6dcce/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 952ea7f..b388698 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
@@ -74,7 +74,7 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
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));
+ camelContext.addComponent("amqp1-0", amqpComponent("amqp://guest:guest@localhost:5672?remote-host=test", false));
return camelContext;
}
@@ -84,6 +84,7 @@ public class AMQPRouteTest extends CamelTestSupport {
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/dbc6dcce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9c4bd60..8acc316 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,8 +333,8 @@
<pojosr-version>0.2.1</pojosr-version>
<powermock-version>1.5.1</powermock-version>
<protobuf-version>2.5.0</protobuf-version>
- <qpid-bundle-version>0.26_1</qpid-bundle-version>
- <qpid-version>0.26</qpid-version>
+ <qpid-bundle-version>0.28_1</qpid-bundle-version>
+ <qpid-version>0.28</qpid-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>