Return-Path: 
 <commits-return-15765-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 69286 invoked from network); 22 Mar 2011 11:10:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 22 Mar 2011 11:10:28 -0000
Received: (qmail 7482 invoked by uid 500); 22 Mar 2011 11:10:28 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 7432 invoked by uid 500); 22 Mar 2011 11:10:28 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 7425 invoked by uid 99); 22 Mar 2011 11:10:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2011 11:10:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2011 11:10:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 69C6A2388901; Tue, 22 Mar 2011 11:09:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1084132 - in /activemq/trunk:
 activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
 activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
 pom.xml
Date: Tue, 22 Mar 2011 11:09:52 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110322110952.69C6A2388901@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Tue Mar 22 11:09:52 2011
New Revision: 1084132

URL: http://svn.apache.org/viewvc?rev=1084132&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to camel 2.8-SNAPSHOT

Modified:
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
    activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java?rev=1084132&r1=1084131&r2=1084132&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java (original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java Tue Mar 22 11:09:52 2011
@@ -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 exten
 
     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());

Modified: activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml?rev=1084132&r1=1084131&r2=1084132&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml (original)
+++ activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml Tue Mar 22 11:09:52 2011
@@ -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"/>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1084132&r1=1084131&r2=1084132&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Mar 22 11:09:52 2011
@@ -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>