From e183a824d396fb61230995d947b978117eae7ffe Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Thu, 6 Aug 2009 09:25:41 +0000
Subject: [PATCH] apply patch from
 https://issues.apache.org/activemq/browse/AMQ-2348 - update to camel-2.0-M3 -
 with thanks

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@801559 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/activemq/camel/CamelMessageProducer.java |  6 ++++--
 .../camel/component/ActiveMQJmsHeaderRouteTest.java | 13 ++++++-------
 .../activemq/camel/component/JournalRouteTest.java  |  4 +++-
 pom.xml                                             |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java b/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
index 9dddb78ac6..d5f151c495 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
@@ -25,9 +25,10 @@ import org.apache.activemq.ActiveMQMessageProducerSupport;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Producer;
-import org.apache.camel.component.jms.JmsExchange;
+import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -87,7 +88,8 @@ public class CamelMessageProducer extends ActiveMQMessageProducerSupport {
             throw new IllegalArgumentException("Invalid destination setting: " + destination + " when expected: " + this.destination);
         }
         try {
-            JmsExchange exchange = new JmsExchange(endpoint, ExchangePattern.InOnly, camelDestination.getBinding(), message);
+			Exchange exchange = endpoint.createExchange(ExchangePattern.InOnly);
+			exchange.setIn(new JmsMessage(message, camelDestination.getBinding()));
             producer.process(exchange);
         } catch (JMSException e) {
             throw e;
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.java
index e261498fbd..7d9fc99eac 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsExchange;
+import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.component.mock.AssertionClause;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.commons.logging.Log;
@@ -85,12 +85,11 @@ public class ActiveMQJmsHeaderRouteTest extends ContextTestSupport {
                 from("activemq:test.a").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         // lets set the custom JMS headers using the JMS API
-                        JmsExchange jmsExchange = assertIsInstanceOf(JmsExchange.class, exchange);
-                        
-                        Message inMessage = jmsExchange.getInMessage();
-                        inMessage.setJMSReplyTo(replyQueue);
-                        inMessage.setJMSCorrelationID(correlationID);
-                        inMessage.setJMSType(messageType);
+						JmsMessage jmsMessage = assertIsInstanceOf(JmsMessage.class, exchange.getIn());
+						
+                        jmsMessage.getJmsMessage().setJMSReplyTo(replyQueue);
+                        jmsMessage.getJmsMessage().setJMSCorrelationID(correlationID);
+                        jmsMessage.getJmsMessage().setJMSType(messageType);
                     }
                 }).to("activemq:test.b?preserveMessageQos=true");
 
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/component/JournalRouteTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/component/JournalRouteTest.java
index 19b7955689..2c1da24824 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/component/JournalRouteTest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/component/JournalRouteTest.java
@@ -19,11 +19,13 @@ package org.apache.activemq.camel.component;
 import java.util.List;
 
 import org.apache.activemq.util.ByteSequence;
+import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.AssertionClause;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
 
 /**
  * @version $Revision$
@@ -39,7 +41,7 @@ public class JournalRouteTest extends ContextTestSupport {
         resultEndpoint.expectedMessageCount(1);
         
         AssertionClause firstMessageExpectations = resultEndpoint.message(0);
-        firstMessageExpectations.header("journal").isEqualTo("activemq.journal:target/test.a");
+        firstMessageExpectations.header("journal").isEqualTo("activemq.journal://target/test.a");
         firstMessageExpectations.header("location").isNotNull();
         firstMessageExpectations.body().isInstanceOf(ByteSequence.class);
 
diff --git a/pom.xml b/pom.xml
index 95f0b87622..6f4ddfa328 100755
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <aopalliance-version>1.0</aopalliance-version>
     <axion-version>1.0-M3-dev</axion-version>
     <axis-version>1.2-RC1</axis-version>
-    <camel-version>2.0-M2</camel-version>
+    <camel-version>2.0-M3</camel-version>
     <cglib-version>2.0</cglib-version>
     <commons-beanutils-version>1.6.1</commons-beanutils-version>
     <commons-collections-version>3.2.1</commons-collections-version>