From 8ba02a395f2337bd31a0b54d96d73dbb4e94acf1 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 22 Mar 2011 11:09:52 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to
 camel 2.8-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084132 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/camel/component/ActiveMQConfigureTest.java      | 4 ++--
 .../src/test/resources/org/apache/activemq/camel/spring.xml  | 5 +----
 pom.xml                                                      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
index 82a4ae1265..b5740845fd 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.component.jms.JmsConsumer;
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.component.jms.JmsProducer;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.listener.AbstractMessageListenerContainer;
 import org.springframework.jms.connection.SingleConnectionFactory;
@@ -63,7 +63,7 @@ public class ActiveMQConfigureTest extends ContextTestSupport {
 
     public void testListenerContainerUsesSpringConnectionFactory() throws Exception {
         JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:topic:test.foo");
-        JmsConsumer consumer = endpoint.createConsumer(new Logger());
+        JmsConsumer consumer = endpoint.createConsumer(new CamelLogger());
 
         AbstractMessageListenerContainer listenerContainer = consumer.getListenerContainer();
         assertEquals("pubSubDomain", true, listenerContainer.isPubSubDomain());
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
index 3948c885cc..eb34816bd3 100644
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
@@ -23,10 +23,7 @@
     ">
 
   <!-- START SNIPPET: example -->
-  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-    <beanPostProcessor/>
-    
-  </camelContext>
+  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring"/>
 
   <bean id="connectionFactory" class="org.apache.activemq.spring.ActiveMQConnectionFactory">
     <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
diff --git a/pom.xml b/pom.xml
index 03fdea6152..2fb111203f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <aries-version>0.2-incubating</aries-version>
     <axion-version>1.0-M3-dev</axion-version>
     <axis-version>1.2-RC1</axis-version>
-    <camel-version>2.6.0</camel-version>
+    <camel-version>2.8-SNAPSHOT</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>