camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r783654 - in /camel/branches/camel-1.x: ./ components/camel-amqp/pom.xml components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
Date Thu, 11 Jun 2009 07:21:38 GMT
Author: ningjiang
Date: Thu Jun 11 07:21:37 2009
New Revision: 783654

URL: http://svn.apache.org/viewvc?rev=783654&view=rev
Log:
Merged revisions 783248 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r783248 | davsclaus | 2009-06-10 16:12:00 +0800 (Wed, 10 Jun 2009) | 1 line
  
  CAMEL-756: upgraded to latest qpid v0.5.0 release.
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-amqp/pom.xml
    camel/branches/camel-1.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 11 07:21:37 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783363,783639
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-amqp/pom.xml?rev=783654&r1=783653&r2=783654&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-amqp/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-amqp/pom.xml Thu Jun 11 07:21:37 2009
@@ -34,15 +34,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>
@@ -70,6 +70,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>
@@ -96,13 +101,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/branches/camel-1.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=783654&r1=783653&r2=783654&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
(original)
+++ camel/branches/camel-1.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
Thu Jun 11 07:21:37 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;
@@ -46,12 +45,9 @@
         }
 
         resultEndpoint.assertIsSatisfied();
-
-
     }
 
-    // TODO fix this test
-    public void xtestJmsRouteWithObjectMessage() throws Exception {
+    public void testJmsRouteWithObjectMessage() throws Exception {
         PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
 
         resultEndpoint.expectedBodiesReceived(expectedBody);
@@ -82,10 +78,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");
     }
 



Mime
View raw message