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 2009/06/10 10:12:00 UTC
svn commit: r783248 - in /camel/trunk/components/camel-amqp: pom.xml
src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
Author: davsclaus
Date: Wed Jun 10 08:12:00 2009
New Revision: 783248
URL: http://svn.apache.org/viewvc?rev=783248&view=rev
Log:
CAMEL-756: upgraded to latest qpid v0.5.0 release.
Modified:
camel/trunk/components/camel-amqp/pom.xml
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
Modified: camel/trunk/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/pom.xml?rev=783248&r1=783247&r2=783248&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/pom.xml (original)
+++ camel/trunk/components/camel-amqp/pom.xml Wed Jun 10 08:12:00 2009
@@ -32,15 +32,15 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.amqp.*</camel.osgi.export.pkg>
- <qpid-version>1.0-incubating-M2.1</qpid-version>
+ <qpid-version>0.5.0</qpid-version>
</properties>
<repositories>
- <repository>
- <id>apache.incubating.releases</id>
- <name>Apache Incubating Release Distribution Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
+ <repository>
+ <id>open.iona.m2-all</id>
+ <name>IONA All Dependency Repository</name>
+ <url>http://repo.open.iona.com/maven2-all</url>
+ </repository>
</repositories>
<dependencies>
@@ -68,6 +68,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
<!-- testing -->
<dependency>
@@ -94,13 +99,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=783248&r1=783247&r2=783248&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java (original)
+++ camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java Wed Jun 10 08:12:00 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.amqp;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -42,12 +41,9 @@
sendExchange(expectedBody);
resultEndpoint.assertIsSatisfied();
-
-
}
- // TODO fix this test, it looks like AMQP don't support Object message
- public void xtestJmsRouteWithObjectMessage() throws Exception {
+ public void testJmsRouteWithObjectMessage() throws Exception {
PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
resultEndpoint.expectedBodiesReceived(expectedBody);
@@ -78,10 +74,14 @@
@Override
protected void setUp() throws Exception {
// lets create an in JVM broker
- TransportConnection.createVMBroker(1);
+ try {
+ TransportConnection.createVMBroker(1);
+ } catch (Exception e) {
+ // fails the first time, so create it again
+ TransportConnection.createVMBroker(1);
+ }
super.setUp();
-
resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
}